diff --git a/Documentation.html b/Documentation.html deleted file mode 100644 index c44921d..0000000 --- a/Documentation.html +++ /dev/null @@ -1,1328 +0,0 @@ - - - - - Documentation.html - - - - - - -

Current Multi Version: 13.0.0

Table of contents

-

Multi static variables

multi.Version — The current version of the library
multi.Priority_Core — Highest level of pirority that can be given to a process
multi.Priority_High
multi.Priority_Above_Normal
multi.Priority_Normal — The default level of pirority that is given to a process
multi.Priority_Below_Normal
multi.Priority_Low
multi.Priority_Idle — Lowest level of pirority that can be given to a process

Multi Runners

multi:mainloop([TABLE settings]) — This runs the mainloop by having its own internal while loop running
multi:threadloop([TABLE settings]) — This runs the mainloop by having its own internal while loop running, but prioritizes threads over multi-objects
multi:uManager([TABLE settings]) — This runs the mainloop, but does not have its own while loop and thus needs to be within a loop of some kind.

Multi Settings

Note: Most settings have been fined tuned to be at the peak of performance already, however preLoop, protect (Which drastically lowers preformance), and stopOnError should be used freely to fit your needs.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SettingType: defaultPurpose
preLoopfunction: nilThis is a function that is called after all the important components of the library are loaded. This is called once only. The first and only argument passed is a reference to itself.
protectboolean: falseThis runs code within a protected call. To catch when errors happen see built in connections
stopOnErrorboolean: falseThis setting is used with protect. If an object crashes due to some error should it be paused?
prioritynumber: 0This sets the priority scheme. Look at the P-Charts below for examples.
auto_priorityboolean: falseNote: This overrides any value set for priority! If auto priority is enabled then priority scheme 3 is used and processes are considered for “recheck” after a certain amount of time. If a process isn’t taking too long to complete anymore then it will be reset to core, if it starts to take a lot of time all of a sudden it will be set to idle.
auto_stretchnumber: 1For use with auto_priority. Modifies the internal reperesentation of idle time by multiplying multi.Priority_Idle by the value given
auto_delaynumber: 3For use with auto_priority. This changes the time in seconds that process are “rechecked”
auto_lowerboundnumber: multi.Priority_IdleFor use with auto_priority. The lowerbound is what is considered to be idle time. A higher value combined with auto_stretch allows one to fine tune how pirority is managed.

P-Chart: Priority 1

P1 follows a forumla that resembles this: ~n=I*PRank where n is the amount of steps given to an object with PRank and where I is the idle time see chart below. The aim of this priority scheme was to make core objects run fastest while letting idle processes get decent time as well.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Priority: nPRankFormula
Core: 33222697n = ~I*7
High: 28476606n = ~I*6
Above_Normal: 23730505n = ~I*5
Normal: 18984404n = ~I*4
Below_Normal: 14238303n = ~I*3
Low: 9492202n = ~I*2
Idle: 4746101n = ~I*1

General Rule: ~n=I*PRank

P-Chart: Priority 2

P2 follows a formula that resembles this: ~n=n*4 where n starts as the initial idle time, see chart below. The goal of this one was to make core process’ higher while keeping idle process’ low.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Priority: n
Core: 6700821
High: 1675205
Above_Normal: 418801
Normal: 104700
Below_Normal: 26175
Low: 6543
Idle: 1635

General Rule: ~n=n*4 Where the inital n = I

P-Chart: Priority 3

P3 Ignores using a basic formula and instead bases its processing time on the amount of cpu time is there. If cpu-time is low and a process is set at a lower priority it will get its time reduced. There is no formula, at idle almost all process work at the same speed!

There are 2 settings for this: Core and Idle. If a process takes too long then it is set to idle. Otherwise it will stay core.

Example of settings:

settings = {
-    preLoop = function(m)
-        print("All settings have been loaded!")
-    end,
-    protect = false,
-    stopOnError = false,
-    priority = 0,
-    auto_priority = false,
-    auto_stretch = 1,
-    auto_delay = 3,
-    auto_lowerbound = multi.Priority_Idle
-}
-
--- Below are how the runners work
-
-multi:mainloop(settings)
-
--- or
-
-multi:threadloop(settings)
-
--- or
-
-while true do
-    multi:uManager(settings)
-end
-

Multi constructors - Multi-Objs

Processors
proc = multi:newProcessor([STRING: file nil])

Non-Actors
timer = multi:newTimer()
conn = multi:newConnection([BOOLEAN protect true])
nil = multi:newJob(FUNCTION func, STRING name)
func = multi:newFunction(FUNCTION func)
trigger = multi:newTrigger(FUNCTION: func)

Actors
event = multi:newEvent(FUNCTION task)
updater = multi:newUpdater([NUMBER skip 1])
alarm = multi:newAlarm([NUMBER 0])
loop = multi:newLoop(FUNCTION func)
tloop = multi:newTLoop(FUNCTION func ,NUMBER: [set 1])
step = multi:newStep(NUMBER start,*NUMBER reset, [NUMBER count 1], [NUMBER skip 0])
tstep = multi:newStep(NUMBER start, NUMBER reset, [NUMBER count 1], [NUMBER set 1])
trigger = multi:newTrigger(FUNCTION: func)
stamper = multi:newTimeStamper()
watcher = multi:newWatcher(STRING name)
watcher = multi:newWatcher(TABLE namespace, STRING name)
cobj = multi:newCustomObject(TABLE objRef, BOOLEAN isActor)

Note: A lot of methods will return self as a return. This is due to the ability to chain that was added in 12.x.x

Processor

proc = multi:newProcessor([STRING file nil])
Creates a processor runner that acts like the multi runner. Actors and Non-Actors can be created on these objects. Pausing a process pauses all objects that are running on that process.

An optional argument file is used if you want to load a file containing the processor data.
Note: This isn’t portable on all areas where lua is used. Some interperters disable loadstring so it is not encouraged to use the file method for creating processors

loop = Processor:getController() — returns the loop that runs the “runner” that drives this processor
self = Processor:Start() — Starts the processor
self = Processor:Pause() — Pauses the processor
self = Processor:Resume() — Resumes a paused processor
nil = Processor:Destroy() — Destroys the processor and all of the Actors running on it

Example

multi = require("multi")
-proc = multi:newProcessor()
-proc:newTLoop(function() -- create a t loop that runs every second
-    print("Hi!")
-end,1) -- where we set the 1 second
-proc:Start() -- let's start the processor
-multi:mainloop() -- the main runner that drives everything
-

Non-Actor: Timers

timer = multi:newTimer()
Creates a timer object that can keep track of time

self = timer:Start() — Starts the timer
time_elapsed = timer:Get() — Returns the time elapsed since timer:Start() was called
boolean = timer:isPaused() — Returns if the timer is paused or not
self = timer:Pause() — Pauses the timer, it skips time that would be counted during the time that it is paused
self = timer:Resume() — Resumes a paused timer. See note below
self = timer:tofile(STRING path) — Saves the object to a file at location path

Note: If a timer was paused after 1 second then resumed a second later and Get() was called a second later, timer would have 2 seconds counted though 3 really have passed.

Non-Actor: Connections

Arguable my favorite object in this library, next to threads

conn = multi:newConnection([BOOLEAN protect true])
Creates a connection object and defaults to a protective state. All calls will run within pcall()

self = conn:HoldUT([NUMBER n 0]) — Will hold futhur execution of the thread until the connection was triggered. If n is supplied the connection must be triggered n times before it will allow ececution to continue.
self = conn:FConnect(FUNCTION func) — Creates a connection that is forced to execute when Fire() is called. returns or nil = conn:Fire(…) — Triggers the connection with arguments …, “returns” if non-nil is a table containing return values from the triggered connections. [Deprecated: Planned removal in 14.x.x]
self = conn:Bind(TABLE t) — sets the table to hold the connections. Leaving it alone is best unless you know what you are doing
self = conn:Remove() — removes the bind that was put in place. This will also destroy all connections that existed before.
link = conn:connect(FUNCTION func, [STRING name nil], [NUMBER num #conns+1]) — Connects to the object using function func which will recieve the arguments passed by Fire(…). You can name a connection, which allows you to use conn:getConnection(name). Names must be unique! num is simple the position in the order in which connections are triggered. The return Link is the link to the connected event that was made. You can remove this event or even trigger it specifically if need be.
link:Fire(...) — Fires the created event
bool = link:Destroy() — returns true if success.
subConn = conn:getConnection(STRING name, BOOLEAN ingore) — returns the sub connection which matches name.
returns or nil subConn:Fire() — “returns” if non-nil is a table containing return values from the triggered connections.
self = conn:tofile(STRING path) — Saves the object to a file at location path

The connect feature has some syntax sugar to it as seen below
link = conn(FUNCTION func, [STRING name nil], [NUMBER #conns+1])

Example:

local multi = require("multi")
--- Let’s create the events
-yawn={}
-OnCustomSafeEvent=multi:newConnection(true) -- lets pcall the calls in case something goes wrong default
-OnCustomEvent=multi:newConnection(false) -- let’s not pcall the calls and let errors happen.
-OnCustomEvent:Bind(yawn) -- create the connection lookup data in yawn
-
--- Let’s connect to them, a recent update adds a nice syntax to connect to these
-cd1=OnCustomSafeEvent:Connect(function(arg1,arg2,...)
-  print("CSE1",arg1,arg2,...)
-end,"bob") -- let’s give this connection a name
-cd2=OnCustomSafeEvent:Connect(function(arg1,arg2,...)
-  print("CSE2",arg1,arg2,...)
-end,"joe") -- let’s give this connection a name
-cd3=OnCustomSafeEvent:Connect(function(arg1,arg2,...)
-  print("CSE3",arg1,arg2,...)
-end) -- let’s not give this connection a name
-
--- Using syntax sugar
-OnCustomEvent(function(arg1,arg2,...)
-  print(arg1,arg2,...)
-end)
-
--- Now within some loop/other object you trigger the connection like
-OnCustomEvent:Fire(1,2,"Hello!!!") -- fire all connections
-
--- You may have noticed that some events have names! See the following example!
-OnCustomSafeEvent:getConnection("bob"):Fire(1,100,"Bye!") -- fire only bob!
-OnCustomSafeEvent:getConnection("joe"):Fire(1,100,"Hello!") -- fire only joe!!
-OnCustomSafeEvent:Fire(1,100,"Hi Ya Folks!!!") -- fire them all!!!
-
--- Connections have more to them than that though!
--- As seen above cd1-cd3 these are hooks to the connection object. This allows you to remove a connection
--- For Example:
-cd1:Remove() -- remove this connection from the master connection object
-print("------")
-OnCustomSafeEvent:Fire(1,100,"Hi Ya Folks!!!") -- fire them all again!!!
--- To remove all connections use:
-OnCustomSafeEvent:Remove()
-print("------")
-OnCustomSafeEvent:Fire(1,100,"Hi Ya Folks!!!") -- fire them all again!!!
-

Non-Actor: Jobs

nil = multi:newJob(FUNCTION func, STRING name) — Adds a job to a queue of jobs that get executed after some time. func is the job that is being ran, name is the name of the job.
nil = multi:setJobSpeed(NUMBER n) — seconds between when each job should be done.
bool, number = multi:hasJobs() — returns true if there are jobs to be processed. And the number of jobs to be processed
num = multi:getJobs() — returns the number of jobs left to be processed.
number = multi:removeJob(STRING name) — removes all jobs of name, name. Returns the number of jobs removed

Note: Jobs may be turned into actual objects in the future.

Example:

local multi = require("multi")
-print(multi:hasJobs())
-multi:setJobSpeed(1) -- set job speed to 1 second
-multi:newJob(function()
-    print("A job!")
-end,"test")
-
-multi:newJob(function()
-    print("Another job!")
-    multi:removeJob("test") -- removes all jobs with name "test"
-end,"test")
-
-multi:newJob(function()
-    print("Almost done!")
-end,"test")
-
-multi:newJob(function()
-    print("Final job!")
-end,"test")
-print(multi:hasJobs())
-print("There are "..multi:getJobs().." jobs in the queue!")
-multi:mainloop()
-

Non-Actor: Functions

func = multi:newFunction(FUNCTION func)
These objects used to have more of a function before corutine based threads came around, but the main purpose now is the ablity to have pausable function calls

... = func(...) — This is how you call your function. The first argument passed is itself when your function is triggered. See example.
self = func:Pause()
self = func:Resume()

Note: A paused function will return: nil, true

Example:

local multi = require("multi")
-printOnce = multi:newFunction(function(self,msg)
-    print(msg)
-    self:Pause()
-    return "I won't work anymore"
-end)
-a=printOnce("Hello World!")
-b,c=printOnce("Hello World!")
-print(a,b,c)
-

Non-Actor: Triggers

trigger = multi:newTrigger(FUNCTION: func(...)) — A trigger is the precursor of connection objects. The main difference is that only one function can be binded to the trigger.
self = trigger:Fire(...) — Fires the function that was connected to the trigger and passes the arguments supplied in Fire to the function given.

Universal Actor functions

All of these functions are found on actors
self = multiObj:Pause() — Pauses the actor from running
self = multiObj:Resume() — Resumes the actor that was paused
nil = multiObj:Destroy() — Removes the object from the mainloop
bool = multiObj:isPaused() — Returns true if the object is paused, false otherwise
string = multiObj:getType() — Returns the type of the object
self = multiObj:SetTime(n) — Sets a timer, and creates a special “timemaster” actor, which will timeout unless ResolveTimer is called
self = multiObj:ResolveTimer(...) — Stops the timer that was put onto the multiObj from timing out
self = multiObj:OnTimedOut(func) — If ResolveTimer was not called in time this event will be triggered. The function connected to it get a refrence of the original object that the timer was created on as the first argument.
self = multiObj:OnTimerResolved(func) — This event is triggered when the timer gets resolved. Same argument as above is passed, but the variable arguments that are accepted in resolvetimer are also passed as well.
self = multiObj:Reset(n) — In the cases where it isn’t obvious what it does, it acts as Resume()
self = multiObj:SetName(STRING name)

Actor: Events

event = multi:newEvent(FUNCTION task)
The object that started it all. These are simply actors that wait for a condition to take place, then auto triggers an event. The event when triggered once isn’t triggered again unless you Reset() it.

self = SetTask(FUNCTION func) — This function is not needed if you supplied task at construction time
self = OnEvent(FUNCTION func) — Connects to the OnEvent event passes argument self to the connectee

Example:

local multi = require("multi")
-count=0
--- A loop object is used to demostrate how one could use an event object.
-loop=multi:newLoop(function(self,dt)
-    count=count+1
-end)
-event=multi:newEvent(function() return count==100 end) -- set the event
-event:OnEvent(function(self) -- connect to the event object
-    loop:Destroy() -- destroys the loop from running!
-    print("Stopped that loop!",count)
-end) -- events like alarms need to be reset the Reset() command works here as well
-multi:mainloop()
-

Actor: Updates

updater = multi:newUpdater([NUMBER skip 1]) — set the amount of steps that are skipped
Updaters are a mix between both loops and steps. They were a way to add basic priority management to loops (until a better way was added). Now they aren’t as useful, but if you do not want the performance hit of turning on priority then they are useful to auro skip some loops. Note: The performance hit due to priority management is not as bas as it used to be.

self = updater:SetSkip(NUMBER n) — sets the amount of steps that are skipped
self = OnUpdate(FUNCTION func) — connects to the main trigger of the updater which is called every nth step

Example:

local multi = require("multi")
-updater=multi:newUpdater(5000) -- simple, think of a loop with the skip feature of a step
-updater:OnUpdate(function(self)
-    print("updating...")
-end)
-multi:mainloop()
-

Actor: Alarms

alarm = multi:newAlarm([NUMBER 0]) — creates an alarm which waits n seconds
Alarms ring after a certain amount of time, but you need to reset the alarm every time it rings! Use a TLoop if you do not want to have to reset.

self = alarm:Reset([NUMBER sec current_time_set]) — Allows one to reset an alarm, optional argument to change the time until the next ring.
self = alarm:OnRing(FUNCTION func — Allows one to connect to the alarm event which is triggerd after a certain amount of time has passed.

Example:

local multi = require("multi")
-alarm=multi:newAlarm(3) -- in seconds can go to .001 uses the built in os.clock()
-alarm:OnRing(function(a)
-    print("3 Seconds have passed!")
-    a:Reset(n) -- if n were nil it will reset back to 3, or it would reset to n seconds
-end)
-multi:mainloop()
-

Actor: Loops

loop = multi:newLoop(FUNCTION func) — func the main connection that you can connect to. Is optional, but you can also use OnLoop(func) to connect as well.
Loops are events that happen over and over until paused. They act like a while loop.

self = OnLoop(FUNCTION func) — func the main connection that you can connect to. Alllows multiple connections to one loop if need be.

Example:

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-local a = 0
-loop = multi:newLoop(function()
-    a = a + 1
-    if a == 1000 then
-        print("a = 1000")
-        loop:Pause()
-    end
-end)
-multi:mainloop()
-

Actor: TLoops

tloop = multi:newTLoop(FUNCTION func ,NUMBER: [set 1]) — TLoops are pretty much the same as loops. The only difference is that they take set which is how long it waits, in seconds, before triggering function func.

self = OnLoop(FUNCTION func) — func the main connection that you can connect to. Alllows multiple connections to one TLoop if need be.

Example:

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-local a = 0
-loop = multi:newTLoop(function()
-    a = a + 1
-    if a == 10 then
-        print("a = 10")
-        loop:Pause()
-    end
-end,1)
-multi:mainloop()
-

Actor: Steps

step = multi:newStep(NUMBER start,*NUMBER reset, [NUMBER count 1], [NUMBER skip 0]) — Steps were originally introduced to bs used as for loops that can run parallel with other code. When using steps think of it like this: for i=start,reset,count do When the skip argument is given, each time the step object is given cpu cycles it will be skipped by n cycles. So if skip is 1 every other cpu cycle will be alloted to the step object.

self = step:OnStart(FUNCTION func(self)) — This connects a function to an event that is triggered everytime a step starts.
self = step:OnStep(FUNCTION func(self,i)) — This connects a function to an event that is triggered every step or cycle that is alloted to the step object
self = step:OnEnd(FUNCTION func(self)) — This connects a function to an event that is triggered when a step reaches its goal
self = step:Update(NUMBER start,*NUMBER reset, [NUMBER count 1], [NUMBER skip 0]) — Update can be used to change the goals of the step. You should call step:Reset() after using Update to restart the step.

Example:

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-multi:newStep(1,10,1,0):OnStep(function(step,pos)
-    print(step,pos)
-end):OnEnd(fucntion(step)
-    step:Destroy()
-end)
-multi:mainloop()
-

Actor: TSteps

tstep = multi:newStep(NUMBER start, NUMBER reset, [NUMBER count 1], [NUMBER set 1]) — TSteps work just like steps, the only difference is that instead of skip, we have set which is how long in seconds it should wait before triggering the OnStep() event.

self = tstep:OnStart(FUNCTION func(self)) — This connects a function to an event that is triggered everytime a step starts.
self = tstep:OnStep(FUNCTION func(self,i)) — This connects a function to an event that is triggered every step or cycle that is alloted to the step object
self = tstep:OnEnd(FUNCTION func(self)) — This connects a function to an event that is triggered when a step reaches its goal
self = tstep:Update(NUMBER start,*NUMBER reset, [NUMBER count 1], [NUMBER set 1]) — Update can be used to change the goals of the step. You should call step:Reset() after using Update to restart the step.
self = tstep:Reset([NUMBER n set]) — Allows you to reset a tstep that has ended, but also can change the time between each trigger.

Example:

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-multi:newTStep(1,10,1,1):OnStep(function(step,pos)
-    print(step,pos)
-end):OnEnd(fucntion(step)
-    step:Destroy()
-end)
-multi:mainloop()
-

Actor: Time Stampers

stamper = multi:newTimeStamper() — This allows for long time spans as well as short time spans.
stamper = stamper:OhSecond(NUMBER second, FUNCTION func) — This takes a value between 0 and 59. This event is called once every second! Not once every second! If you want seconds then use alarms*! 0 is the start of every minute and 59 is the end of every minute.
stamper = stamper:OhMinute(NUMBER minute, FUNCTION func) — This takes a value between 0 and 59. This event is called once every hour*! Same concept as OnSecond()
stamper = stamper:OhHour(NUMBER hour, FUNCTION func) — This takes a value between 0 and 23. This event is called once every day*! 0 is midnight and 23 is 11pm if you use 12 hour based time.
stamper = stamper:OnDay(STRING/NUMBER day, FUNCTION func) — So the days work like this ‘Sun’, ‘Mon’, ‘Tue’, ‘Wed’, ‘Thu’, ‘Fri’, ‘Sat’. When in string form this is called every week. When in number form this is called every month*!
There is a gotcha though with this. Months can have 28,29,30, and 31 days to it, which means that something needs to be done when dealing with the last few days of a month. I am aware of this issue and am looking into a solution that is simple and readable. I thought about allowing negitive numbers to allow one to eaisly use the last day of a month. -1 is the last day of the month where -2 is the second to last day of the month. You can go as low as -28 if you want, but this provides a nice way to do something near the end of the month that is lua like.
stamper = stamper:OnMonth(NUMBER month,FUNCTION func) — This takes a value between 1 and 12. 1 being January and 12 being December. Called once per year*.
stamper = stamper:OnYear(NUMBER year,FUNCTION func) — This takes a number yy. for example 18 do not use yyyy format! Odds are you will not see this method triggered more than once, unless science figures out the whole life extension thing. But every century this event is triggered*! I am going to be honest though, the odds of a system never reseting for 100 years is very unlikely, so if I used 18 (every 18th year in each century every time i load my program this event will be triggered). Does it actually work? I have no idea tbh it should, but can i prove that without actually testing it? Yes by using fake data thats how.
stamper = stamper:OnTime(NUMBER hour,NUMBER minute,NUMBER second,FUNCTION func) — This takes in a time to trigger, hour, minute, second. This triggeres once a day at a certain time! Sort of like setting an alarm! You can combine events to get other effects like this!
stamper = stamper:OnTime(STRING time,FUNCTION func) — This takes a string time that should be formatted like this: “hh:mm:ss” hours minutes and seconds must be given as parameters! Otherwise functions as above!

*If your program crashes or is rebooted than the data in RAM letting the code know that the function was already called will be reset! This means that if an event set to be triggered on Monday then you reboot the code it will retrigger that event on the same day if the code restarts. In a future update I am planning of writing to the disk for OnHour/Day/Week/Year events. This will be an option that can be set on the object.

Examples:
OnSecond

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-ts = multi:newTimeStamper()
-local a = 0
-ts:OnSecond(0,function()
-    a=a+1
-    print("New Minute: "..a.." <"..os.date("%M")..">")
-end)
-multi:mainloop()
-

OnMinute

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-ts = multi:newTimeStamper()
-local a = 0
-ts:OnSecond(0,function()
-    a=a+1
-    print("New Hour: "..a.." <"..os.date("%I")..">")
-end)
-multi:mainloop()
-

OnHour

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-ts = multi:newTimeStamper()
-ts:OnHour(0,function()
-    print("New Day")
-end)
-multi:mainloop()
-

OnDay

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-ts = multi:newTimeStamper()
-ts:OnDay("Thu",function()
-    print("It's thursday!")
-end)
-multi:mainloop()
-
package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-ts = multi:newTimeStamper()
-ts:OnDay(2,function()
-    print("Second day of the month!")
-end)
-multi:mainloop()
-
package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-ts = multi:newTimeStamper()
-ts:OnDay(-1,function()
-    print("Last day of the month!")
-end)
-multi:mainloop()
-

OnYear

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-ts = multi:newTimeStamper()
-ts:OnYear(19,function() -- They gonna wonder if they run this in 2018 why it no work :P
-    print("We did it!")
-end)
-multi:mainloop()
-

OnTime

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-ts = multi:newTimeStamper()
-ts:OnTime(12,1,0,function()
-    print("Whooooo")
-end)
-multi:mainloop()
-
package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-ts = multi:newTimeStamper()
-ts:OnTime("12:04:00",function()
-    print("Whooooo")
-end)
-multi:mainloop()
-

Actor: Watchers

Deprecated: This object was removed due to its uselessness. Metatables will work much better for what is being done. Perhaps in the future i will remake this method to use metamethods instead of basic watching every step. This will most likely be removed in the next version of the library or changed to use metatables and metamethods.
watcher = multi:newWatcher(STRING name) — Watches a variable on the global namespace
watcher = multi:newWatcher(TABLE namespace, STRING name) — Watches a variable inside of a table
watcher = watcher::OnValueChanged(Function func(self, old_value, current_value))

Example

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-test = {a=0}
-watcher = multi:newWatcher(test,"a")
-watcher:OnValueChanged(function(self, old_value, current_value)
-    print(old_value,current_value)
-end)
-multi:newTLoop(function()
-    test.a=test.a + 1
-end,.5)
-multi:mainloop()
-

Actor: Custom Object

cobj = multi:newCustomObject(TABLE objRef, BOOLEAN isActor [false]) — Allows you to create your own multiobject that runs each allotted step. This allows you to create your own object that works with all the features that each built in multi object does. If isActor is set to true you must have an Act method in your table. See example below. If an object is not an actor than the Act method will not be automatically called for you.

Example:

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-local work = false
-ticktock = multi:newCustomObject({
-    timer = multi:newTimer(),
-    Act = function(self)
-        if self.timer:Get()>=1 then
-            work = not work
-            if work then
-                self.OnTick:Fire()
-            else
-                self.OnTock:Fire()
-            end
-            self.timer:Reset()
-        end
-    end,
-    OnTick = multi:newConnection(),
-    OnTock = multi:newConnection(),
-},true)
-ticktock.OnTick(function()
-    print("Tick")
-end)
-ticktock.OnTock(function()
-    print("Tock")
-end)
-multi:mainloop()
-

Coroutine based Threading (CBT)

This was made due to the limitations of multiObj:hold(), which no longer exists. When this library was in its infancy and before I knew about coroutines, I actually tried to emulate what coroutines did in pure lua.
The threaded bariants of the non threaded objects do exist, but there isn’t too much of a need to use them.

The main benefits of using the coroutine based threads is the thread.* namespace which gives you the ability to easily run code side by side.

A quick note on how threads are managed in the library. The library contains a scheduler which keeps track of coroutines and manages them. Coroutines take some time then give off processing to another coroutine. Which means there are some methods that you need to use in order to hand off cpu time to other coroutines or the main thread. You must hand off cpu time when inside of a non ending loop or your code will hang. Threads also have a slight delay before starting, about 3 seconds.

threads.*

thread.sleep(NUMBER n) — Holds execution of the thread until a certain amount of time has passed
thread.hold(FUNCTION func) — Hold execttion until the function returns true
thread.skip(NUMBER n) — How many cycles should be skipped until I execute again
thread.kill() — Kills the thread
thread.yeild() — Is the same as using thread.skip(0) or thread.sleep(0), hands off control until the next cycle
thread.isThread() — Returns true if the current running code is inside of a coroutine based thread
thread.getCores() — Returns the number of cores that the current system has. (used for system threads)
thread.set(STRING name, VARIABLE val) — A global interface where threads can talk with eachother. sets a variable with name and its value
thread.get(STRING name) — Gets the data stored in name
thread.waitFor(STRING name) — Holds executon of a thread until variable name exists
thread.testFor(STRING name,VARIABLE val,STRING sym) — holds execution untile variable name exists and is compared to val
sym can be equal to: “=”, “==”, “<”, “>”, “<=”, or “>=” the way comparisan works is: “return val sym valTested“

CBT: Thread

multi:newThread(STRING name,FUNCTION func) — Creates a new thread with name and function.
Note: newThread() returns nothing. Threads are opperated hands off everything that happens, does so inside of its functions.

Threads simplify many things that you would use non CBT objects for. I almost solely use CBT for my current programming. I will slso show the above custom object using threads instead. Yes its cool and can be done.

Examples:

package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-multi:newThread("Example of basic usage",function()
-    while true do
-        thread.sleep(1)
-        print("We just made an alarm!")
-    end
-end)
-multi:mainloop()
-
package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-
-function multi:newTickTock()
-    local work = false
-    local _alive = true
-    local OnTick = multi:newConnection()
-    local OnTock = multi:newConnection()
-    local c =multi:newCustomObject{
-        OnTick = OnTick,
-        OnTock = OnTock,
-        Destroy = function()
-            _alive = false -- Threads at least how they work here now need a bit of data management for cleaning up objects. When a thread either finishes its execution of thread.kill() is called everything is removed from the scheduler letting lua know that it can garbage collect
-        end
-    }
-    multi:newThread("TickTocker",function()
-        while _alive do
-            thread.sleep(1)
-            work = not work
-            if work then
-                OnTick:Fire()
-            else
-                OnTock:Fire()
-            end
-        end
-        thread.kill() -- When a thread gets to the end of it's ececution it will automatically be ended, but having this method is good to show what is going on with your code.
-    end)
-    return c
-end
-ticktock = multi:newTickTock()
-ticktock.OnTick(function()
-    print("Tick")
-    -- The thread.* namespace works in all events that
-end)
-ticktock.OnTock(function()
-    print("Tock")
-end)
-multi:mainloop()
-
package.path="?/init.lua;?.lua;"..package.path
-local multi = require("multi")
-
-multi:newThread("TickTocker",function()
-    print("Waiting for variable a to exist...")
-    ret,ret2 = thread.hold(function()
-        return a~=nil, "test!"
-    end)
-    print(ret,ret2) -- The hold method returns the arguments when the first argument is true. This methods return feature is rather new and took more work then you think to get working. Since threads
-end)
-multi:newAlarm(3):OnRing(function() a = true end) -- allows a to exist
-
-multi:mainloop()
-

CBT: Threaded Process

process = multi:newThreadedProcess(STRING name) — Creates a process object that is able allows all processes created on it to use the thread.* namespace

nil = process:getController() — Returns nothing there is no “controller” when using threaded processes
self = process:Start() — Starts the processor
self = process:Pause() — Pauses the processor
self = process:Resume() — Resumes a paused processor
self = process:Kill() — Kills/Destroys the process thread
self = process:Remove() — Destroys/Kills the processor and all of the Actors running on it
self = process:Sleep(NUMBER n) — Forces a process to sleep for n amount of time
self = process:Hold(FUNCTION/NUMBER n) — Forces a process to either test a condition or sleep.

Everything eles works as if you were using the multi. interface. You can create multi objects on the process and the objects are able to use the thread. interface.

Note: When using Hold/Sleep/Skip on an object created inside of a threaded process, you actually hold the entire process! Which means all objects on that process will be stopping until the conditions are met!

Example:

test = multi:newThreadedProcess("test")
-test:newLoop(function()
-    print("HI!")
-end)
-test:newLoop(function()
-    print("HI2!")
-    thread.sleep(.5)
-end)
-multi:newAlarm(3):OnRing(function()
-    test:Sleep(10)
-end)
-test:Start()
-multi:mainloop()
-

CBT: Hyper Threaded Process

process = multi:newHyperThreadedProcess(STRING name) — Creates a process object that is able allows all processes created on it to use the thread.* namespace. Hold/Sleep/Skip can be used in each multi obj created without stopping each other object that is running, but allows for one to pause/halt a process and stop all objects running in that process.

nil = process:getController() — Returns nothing there is no “controller” when using threaded processes
self = process:Start() — Starts the processor
self = process:Pause() — Pauses the processor
self = process:Resume() — Resumes a paused processor
self = process:Kill() — Kills/Destroys the process thread
self = process:Remove() — Destroys/Kills the processor and all of the Actors running on it
self = process:Sleep(NUMBER n) — Forces a process to sleep for n amount of time
self = process:Hold(FUNCTION/NUMBER n) — Forces a process to either test a condition or sleep.

Example:

test = multi:newHyperThreadedProcess("test")
-test:newLoop(function()
-    print("HI!")
-end)
-test:newLoop(function()
-    print("HI2!")
-    thread.sleep(.5)
-end)
-multi:newAlarm(3):OnRing(function()
-    test:Sleep(10)
-end)
-test:Start()
-multi:mainloop()
-

Same example as above, but notice how this works opposed to the non hyper version

System Threads (ST) - Multi-Integration Getting Started

The system threads need to be required seperatly.

local GLOBAL, THREAD = require("multi.integration.lanesManager").init()# -- We will talk about the global and thread interface that is returned
-GLOBAL, THREAD = require("multi.integration.loveManager").init()
-GLOBAL, THREAD = require("luvitManager")-- There is a catch to this*
-

Using this integration modifies some methods that the multi library has.
multi:canSystemThread() — Returns true is system threading is possible
multi:getPlatform() — Returns (for now) either “lanes”, “love2d” and “luvit”
This variable is created on the main thread only inside of the multi namespace: multi.isMainThread = true
This is used to know which thread is the main thread. When network threads are being discussed there is a gotcha that needs to be addressed.

* GLOBAL and THREAD do not work currently when using the luvit integration
#So you may have noticed that when using the lanes manager you need to make the global and thread local, this is due to how lanes copies local variables between states. Also love2d does not require this, actually things will break if this is done! Keep these non local since the way threading is handled at the lower level is much different anyway so GLOBAL and THREAD is automatically set up for use within a spawned thread!

ST - THREAD namespace

THREAD.set(STRING name, VALUE val) — Sets a value in GLOBAL
THREAD.get(STRING name) — Gets a value in GLOBAL
THREAD.waitFor(STRING name) — Waits for a value in GLOBAL to exist
THREAD.testFor(STRING name, VALUE val, STRING sym) — NOT YET IMPLEMENTED but planned
THREAD.getCores() — Returns the number of actual system threads/cores
THREAD.kill() — Kills the thread
THREAD.getName() — Returns the name of the working thread
THREAD.sleep(NUMBER n) — Sleeps for an amount of time stopping the current thread
THREAD.hold(FUNCTION func) — Holds the current thread until a condition is met
THREAD.getID() — returns a unique ID for the current thread. This varaiable is visible to the main thread as well by accessing it through the returned thread object. OBJ.Id

ST - GLOBAL namespace

Treat global like a table.

GLOBAL["name"] = "Ryan"
-print(GLOBAL["name"])
-

Removes the need to use THREAD.set() and THREAD.get()

ST - System Threads

systemThread = multi:newSystemThread(STRING thread_name,FUNCTION spawned_function,ARGUMENTS ...) — Spawns a thread with a certain name.
systemThread:kill() — kills a thread; can only be called in the main thread!
systemThread.OnError(FUNCTION(systemthread,errMsg,errorMsgWithThreadName))

System Threads are the feature that allows a user to interact with systen threads. It differs from regular coroutine based thread in how it can interact with variables. When using system threads the GLOBAL table is the “only way”* to send data. Spawning a System thread is really simple once all the required libraries are in place. See example below:

local multi = require("multi") -- keep this global when using lanes or implicitly define multi within the spawned thread
-local GLOBAL, THREAD = require("multi.integration.lanesManager").init()
-multi:newSystemThread("Example thread",function()
-    local multi = require("multi") -- we are in a thread so lets not refer to that upvalue!
-    print("We have spawned a thread!")
-    -- we could do work but theres no need to we can save that for other examples
-    print("Lets have a non ending loop!")
-    while true do
-        -- If this was not in a thread execution would halt for the entire process
-    end
-end,"A message that we are passing") -- There are restrictions on what can be passed!
-
-tloop = multi:newTLoop(function()
-    print("I'm still kicking!")
-end,1)
-multi:mainloop()
-

*This isn’t entirely true, as of right now the compatiablity with the lanes library and love2d engine have their own methods to share data, but if you would like to have your code work in both enviroments then using the GLOBAL table and the data structures provided by the multi library will ensure this happens. If you do not plan on having support for both platforms then feel free to use linda’s in lanes and channels in love2d.

Note: luvit currently has very basic support, it only allows the spawning of system threads, but no way to send data back and forth as of yet. I do not know if this is doable or not, but I will keep looking into it. If I can somehow emulate System Threaded Queues and the GLOBAL tabke then all other datastructures will work!

ST - System Threaded Objects

Great we are able to spawn threads, but unless your working with a process that works on passed data and then uses a socket or writes to the disk I can’t do to much with out being able to pass data between threads. This section we will look at how we can share objects between threads. In order to keep the compatibility between both love2d and lanes I had to format the system threaded objects in a strange way, but they are consistant and should work on both enviroments.

When creating objects with a name they are automatically exposed to the GLOBAL table. Which means you can retrieve them from a spawned thread. For example we have a queue object, which will be discussed in more detail next.

-- Exposing a queue
-multi = require("multi")
-local GLOBAL, THREAD = require("multi.integration.lanesManager").init() -- The standard setup above
-queue = multi:newSystemThreadedQueue("myQueue"):init() -- We create and initiate the queue for the main thread
-queue:push("This is a test!") -- We push some data onto the queue that other threads can consume and do stuff with
-multi:newSystemThread("Example thread",function() -- Create a system thread
-    queue = THREAD.waitFor("myQueue"):init() -- Get the queue. It is good pratice to use the waitFor command when getting objects. If it doesn't exist yet we wait for it, preventing future errors. It is possible for the data to not ve present when a thread is looking for it! Especally when using the love2d module, my fault needs some rewriting data passing on the GLOBAL is quite slow, but the queue internally uses channels so after it is exposed you should have good speeds!
-    local data = queue:pop() -- Get the data
-    print(data) -- print the data
-end)
-multi:mainloop()
-

ST - SystemThreadedQueue

queue(nonInit) = multi:newSystemThreadedQueue(STRING name) — You must enter a name!
queue = queue:init() — initiates the queue, without doing this it will not work
void = queue:push(DATA data) — Pushes data into a queue that all threads that have been shared have access to
data = queue:pop() — pops data from the queue removing it from all threads
data = queue:peek() — looks at data that is on the queue, but dont remove it from the queue

This object the System Threaded Queue is the basis for all other data structures that a user has access to within the “shared” objects.

General tips when using a queue. You can always pop from a queue without worrying if another thread poped that same data, BUT if you are peeking at a queue there is the possibility that another thread popped the data while you are peeking and this could cause an issue, depends on what you are doing though. It’s important to keep this in mind when using queues.

Let’s get into some examples:

multi = require("multi")
-thread_names = {"Thread_A","Thread_B","Thread_C","Thread_D"}
-local GLOBAL, THREAD = require("multi.integration.lanesManager").init()
-queue = multi:newSystemThreadedQueue("myQueue"):init()
-for _,n in pairs(thread_names) do
-    multi:newSystemThread(n,function()
-        queue = THREAD.waitFor("myQueue"):init()
-        local name = THREAD.getName()
-        local data = queue:pop()
-        while data do
-            print(name.." "..data)
-            data = queue:pop()
-        end
-    end)
-end
-for i=1,100 do
-    queue:push(math.random(1,1000))
-end
-multi:newEvent(function() -- Felt like using the event object, I hardly use them for anything non internal
-    return not queue:peek()
-end):OnEvent(function()
-    print("No more data within the queue!")
-    os.exit()
-end)
-multi:mainloop()
-

You have probable noticed that the output from this is a total mess! Well I though so too, and created the system threaded console!

ST - SystemThreadedConsole

console(nonInit) = multi:newSystemThreadedConsole(STRING name) — Creates a console object called name. The name is mandatory!
concole = console:inti() — initiates the console object
console:print(...) — prints to the console
console:write(msg) — writes to the console, to be fair you wouldn’t want to use this one.

The console makes printing from threads much cleaner. We will use the same example from above with the console implemented and compare the outputs and how readable they now are!

multi = require("multi")
-thread_names = {"Thread_A","Thread_B","Thread_C","Thread_D"}
-local GLOBAL, THREAD = require("multi.integration.lanesManager").init()
-multi:newSystemThreadedConsole("console"):init()
-queue = multi:newSystemThreadedQueue("myQueue"):init()
-for _,n in pairs(thread_names) do
-    multi:newSystemThread(n,function()
-        local queue = THREAD.waitFor("myQueue"):init()
-        local console = THREAD.waitFor("console"):init()
-        local name = THREAD.getName()
-        local data = queue:pop()
-        while data do
-            --THREAD.sleep(.1) -- uncomment this to see them all work
-            console:print(name.." "..data)
-            data = queue:pop()
-        end
-    end)
-end
-for i=1,100 do
-    queue:push(math.random(1,1000))
-end
-multi:newEvent(function()
-    return not queue:peek()
-end):OnEvent(function()
-    multi:newAlarm(.1):OnRing(function() -- Well the mainthread has to read from an internal queue so we have to wait a sec
-        print("No more data within the queue!")
-        os.exit()
-    end)
-end)
-multi:mainloop()
-

As you see the output here is so much cleaner, but we have a small gotcha, you probably noticed that I used an alarm to delay the exiting of the program for a bit. This is due to how the console object works, I send all the print data into a queue that the main thread then reads and prints out when it looks at the queue. This should not be an issue since you gain so much by having clean outputs!

Another thing to note, because system threads are put to work one thread at a time, really quick though, the first thread that is loaded is able to complete the tasks really fast, its just printing after all. If you want to see all the threads working uncomment the code with THREAD.sleep(.1)

ST - SystemThreadedJobQueue

ST - SystemThreadedConnection - WIP*

connection(nonInit) = multi:newSystemThreadedConnection(name,protect) — creates a connecion object
connection = connection:init() — initaties the connection object
connectionID = connection:connect(FUNCTION func) — works like the regular connect function
void = connection:holdUT(NUMBER/FUNCTION n) — works just like the regular holdut function
void = connection:Remove() — works the same as the default
voic = connection:Fire(ARGS ...) — works the same as the default

In the current form a connection object requires that the multi:mainloop() is running on the threads that are sharing this object! By extention since SystemThreadedTables rely on SystemThreadedConnections they have the same requirements. Both objects should not be used for now.

Since the current object is not in a stable condition, I will not be providing examples of how to use it just yet!

*The main issue we have with the connection objects in this form is proper comunication and memory managament between threads. For example if a thread crashes or no longer exists the current apporach to how I manage the connection objects will cause all connections to halt. This feature is still being worked on and has many bugs to be patched out. for now only use for testing purposes.

ST - SystemThreadedTable - WIP*

ST - SystemThreadedBenchmark

bench = multi:SystemThreadedBenchmark(NUMBER seconds) — runs a benchmark for a certain amount of time
bench:OnBench(FUNCTION callback(NUMBER steps/second))

multi = require("multi")
-local GLOBAL, THREAD = require("multi.integration.lanesManager").init()
-multi:SystemThreadedBenchmark(1).OnBench(function(...)
-    print(...)
-end)
-multi:mainloop()
-

ST - SystemThreadedExecute WIP* Might remove

Network Threads - Multi-Integration

- - - - diff --git a/Documentation.md b/Documentation.md index 619995f..c57994d 100644 --- a/Documentation.md +++ b/Documentation.md @@ -415,7 +415,7 @@ Helpful methods are wrapped around the builtin coroutine module which make it fe **threads.\* used within threaded enviroments** - `thread.sleep(NUMBER n)` — Holds execution of the thread until a certain amount of time has passed -- `VARIABLE returns = thread.hold(FUNCTION func)` — Hold execution until the function returns non nil. All returns are passed to the thread once the conditions have been met. To pass nil use `multi.NIL` +- `VARIABLE returns = thread.hold(FUNCTION func)` — Hold execution until the function returns non nil. All returns are passed to the thread once the conditions have been met. To pass nil use `multi.NIL`\* - `thread.skip(NUMBER n)` — How many cycles should be skipped until I execute again - `thread.kill()` — Kills the thread - `thread.yeild()` — Is the same as using thread.skip(0) or thread.sleep(0), hands off control until the next cycle @@ -432,6 +432,8 @@ Helpful methods are wrapped around the builtin coroutine module which make it fe - `handler.connect(Function: func(returns))` — Connects to the event that is triggered when the returns are avaiable - `VARIAABLE returns = handler.wait()` — Waits until returns are avaiable and then returns them +\*A note about multi.NIL, this should only be used within the hold and hold like methods. thread.hold(), thread.holdFor(), and thread.holdWithin() methods. This is not needed within threaded functions! The reason hold prevents nil and false is because it is testing for a condition so the first argument needs to be non nil nor false! multi.NIL should not be used anywhere else. Sometimes you may need to pass a 'nil' value or return. While you could always return true or something you could use multi.NIL to force a nil value through a hold like method. + # CBT: newService(FUNCTION: func) `serv = newService(FUNCTION: func(self,TABLE: data))` - `serv.OnError(FUNCTION: func)` — connection that fired if there is an error @@ -460,6 +462,7 @@ Helpful methods are wrapped around the builtin coroutine module which make it fe # CBT: newThread() `th = multi:newThread([STRING name,] FUNCTION func)` — Creates a new thread with name and function. +when within a thread, if you have any holding code you will want to use thread.* to give time to other threads while your code is running. Constants --- - `th.Name` — Name of thread diff --git a/PManager.txt b/PManager.txt deleted file mode 100644 index 8ddf23a..0000000 --- a/PManager.txt +++ /dev/null @@ -1,29 +0,0 @@ -C: 3322269 ~I*7 -H: 2847660 ~I*6 -A: 2373050 ~I*5 -N: 1898440 ~I*4 -B: 1423830 ~I*3 -L: 949220 ~I*2 -I: 474610 ~I -~n=I*PRank - -P2 ---------------- -C: 6700821 -H: 1675205 -A: 418801 -N: 104700 -B: 26175 -L: 6543 -I: 1635 -~n=n*4 - -P3 ----------------- -C: 2120906 -H: 2120906 -A: 2120906 -N: 2120906 -B: 2120906 -L: 2120906 -I: 2120506 \ No newline at end of file diff --git a/README.html b/README.html deleted file mode 100644 index e63ea3a..0000000 --- a/README.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - README.html - - - - - - -

multi Version: 13.1.0 Bug fixes and a few features added (See changes.md)

Found an issue? Please submit it and ill look into it!

My multitasking library for lua. It is a pure lua binding, if you ignore the integrations and the love2d compat. If you find any bugs or have any issues, please let me know . If you don’t see a table of contents try using the ReadMe.html file. It is easier to navigate than readme

INSTALLING

Note: The latest version of Lua lanes is required if you want to make use of system threads on lua 5.1+. I will update the dependencies for Lua rocks since this library should work fine on lua 5.1+ You also need the lua-net library and the bin library. all installed automatically using luarocks. however you can do this manually if lanes and luasocket are installed. Links:
https://github.com/rayaman/bin
https://github.com/rayaman/multi
https://github.com/rayaman/net

To install copy the multi folder into your environment and you are good to go

If you want to use the system threads, then you’ll need to install lanes!
or use luarocks

Because of a codependency in net libaray, if using the networkmanager you will need to install the net library sepertly
Going forward I will include a Release zip for love2d. I do not know why I haven’t done this yet

luarocks install multi
-luarocks install lnet
-

Discord

For real-time assistance with my libraries! A place where you can ask questions and get help with any of my libraries. Also, you can request features and stuff there as well.

https://discord.gg/U8UspuA

Planned features/TODO

Usage:

-- Basic usage Alarms: Have been moved to the core of the library require("multi") would work as well
-local multi = require("multi") -- gets the entire library
-alarm=multi:newAlarm(3) -- in seconds can go to .001 uses the built in os.clock()
-alarm:OnRing(function(a)
-  print("3 Seconds have passed!")
-  a:Reset(n) -- if n were nil it will reset back to 3, or it would reset to n seconds
-end)
-multi:mainloop() -- the main loop of the program, multi:umanager() exists as well to allow integration in other loops Ex: love2d love.update function. More on this binding in the wiki!
-

Known Bugs/Issues

Currently no bugs that I know of :D

- - - - diff --git a/README.md b/README.md index 054c9f5..251a911 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# multi Version: 14.1.0 System threaded functions and more? (See changes.md for detailed changes) +# multi Version: 14.2.0 Documentation Complete! Found an issue? Please [submit it](https://github.com/rayaman/multi/issues) and I'll look into it! @@ -7,7 +7,6 @@ My multitasking library for lua. It is a pure lua binding, if you ignore the int INSTALLING ---------- Links to dependicies: -[bin](https://github.com/rayaman/bin) [net](https://github.com/rayaman/net) [lanes](https://github.com/LuaLanes/lanes) diff --git a/changes.md b/changes.md index 36e1b38..7c00a15 100644 --- a/changes.md +++ b/changes.md @@ -80,6 +80,7 @@ Added: Fixed: --- +- Issue with threaded functions not handling nil properly from returns. This has been resolved and works as expected. - Issue with system threaded job queues newFunction() not allowing nil returns! This has be addressed and is no longer an issue. - Issue with hold like functions not being able to return `false` - Issue with connections not returning a handle for managing a specific conn object. @@ -119,6 +120,8 @@ Changed: Removed: --- +- bin dependency from the rockspec +- Example folder and .html variants of the .md files - multi:newTrigger() — Connections do everything this thing could do and more. - multi:newHyperThreadedProcess(name)* - multi:newThreadedProcess(name)* diff --git a/examples/RegisteredFunctions.dat b/examples/RegisteredFunctions.dat deleted file mode 100644 index e69de29..0000000 diff --git a/examples/SystemThreadedExecuteTest.lua b/examples/SystemThreadedExecuteTest.lua deleted file mode 100644 index 2b830d3..0000000 --- a/examples/SystemThreadedExecuteTest.lua +++ /dev/null @@ -1,6 +0,0 @@ -package.path="?/init.lua;"..package.path -require("multi") -multi:newAlarm(5):OnRing(function() - os.exit(10) -end) -multi:mainloop() diff --git a/examples/alarmTest.lua b/examples/alarmTest.lua deleted file mode 100644 index 632a8ee..0000000 --- a/examples/alarmTest.lua +++ /dev/null @@ -1,11 +0,0 @@ --- Tick Tock Example -require("multi") -alarm=multi:newAlarm(1) -alarm.state=-1 -- set the state to -1 -alarm.sounds={[-1]="Tick",[1]="Tock"} -- this makes changing between states easy and fast -alarm:OnRing(function(self) - print(self.sounds[self.state]) - self.state=self.state*-1 -- change the state in one line - self:Reset() -- Reset the alarm so it runs again -end) -multi:mainloop() diff --git a/examples/compattest.lua b/examples/compattest.lua deleted file mode 100644 index 2edc13e..0000000 --- a/examples/compattest.lua +++ /dev/null @@ -1,7 +0,0 @@ -package.path="?/init.lua;"..package.path -require("multi") -require("multi.compat.backwards[1,5,0]") -multi:newLoop(function(dt,self) - print(dt) -end) -multi:mainloop() -- start the main runner diff --git a/examples/lanesintegratetest.lua b/examples/lanesintegratetest.lua deleted file mode 100644 index 820385c..0000000 --- a/examples/lanesintegratetest.lua +++ /dev/null @@ -1,34 +0,0 @@ -package.path="?/init.lua;?.lua;"..package.path -local GLOBAL,sThread=require("multi.integration.lanesManager").init() -multi:newAlarm(2):OnRing(function(self) - GLOBAL["NumOfCores"]=sThread.getCores() -end) -multi:newAlarm(7):OnRing(function(self) - GLOBAL["AnotherTest"]=true -end) -multi:newAlarm(13):OnRing(function(self) - GLOBAL["FinalTest"]=true -end) -multi:newSystemThread("test",function() -- spawns a thread in another lua process - require("multi.all") -- now you can do all of your coding with the multi library! You could even spawn more threads from here with the intergration. You would need to require the interaction again though - print("Waiting for variable: NumOfCores") - print("Got it: ",sThread.waitFor("NumOfCores")) - sThread.hold(function() - return GLOBAL["AnotherTest"] -- note this would hold the entire systemthread. Spawn a coroutine thread using multi:newThread() or multi:newThreaded... - end) - print("Holding works!") - multi:newThread("tests",function() - thread.hold(function() - return GLOBAL["FinalTest"] -- note this will not hold the entire systemthread. As seen with the TLoop constantly going! - end) - print("Final test works!") - os.exit() - end) - local a=0 - multi:newTLoop(function() - a=a+1 - print(a) - end,.5) - multi:mainloop() -end) -multi:mainloop() diff --git a/examples/lanesintegratetest2.lua b/examples/lanesintegratetest2.lua deleted file mode 100644 index ecaf091..0000000 --- a/examples/lanesintegratetest2.lua +++ /dev/null @@ -1,59 +0,0 @@ -package.path="?/init.lua;?.lua;"..package.path -local GLOBAL,sThread=require("multi.integration.lanesManager").init() -- loads the lanesManager and includes the entire multi library -local function comma_value(amount) - local formatted = amount - while true do - formatted, k = string.gsub(formatted, "^(-?%d+)(%d%d%d)", '%1,%2') - if (k==0) then - break - end - end - return formatted -end -multi:newSystemThread("test1",function() -- spawns a thread in another lua process - require("multi.all") -- now you can do all of your coding with the multi library! You could even spawn more threads from here with the intergration. You would need to require the interaction again though - multi:benchMark(sThread.waitFor("Bench"),nil,"Thread 1"):OnBench(function(self,c) GLOBAL["T1"]=c multi:Stop() end) - multi:mainloop() -end) -multi:newSystemThread("test2",function() -- spawns a thread in another lua process - require("multi.all") -- now you can do all of your coding with the multi library! You could even spawn more threads from here with the intergration. You would need to require the interaction again though - multi:benchMark(sThread.waitFor("Bench"),nil,"Thread 2"):OnBench(function(self,c) GLOBAL["T2"]=c multi:Stop() end) - multi:mainloop() -end) -multi:newSystemThread("test3",function() -- spawns a thread in another lua process - require("multi.all") -- now you can do all of your coding with the multi library! You could even spawn more threads from here with the intergration. You would need to require the interaction again though - multi:benchMark(sThread.waitFor("Bench"),nil,"Thread 3"):OnBench(function(self,c) GLOBAL["T3"]=c multi:Stop() end) - multi:mainloop() -end) -multi:newSystemThread("test4",function() -- spawns a thread in another lua process - require("multi.all") -- now you can do all of your coding with the multi library! You could even spawn more threads from here with the intergration. You would need to require the interaction again though - multi:benchMark(sThread.waitFor("Bench"),nil,"Thread 4"):OnBench(function(self,c) GLOBAL["T4"]=c multi:Stop() end) - multi:mainloop() -end) -multi:newSystemThread("test5",function() -- spawns a thread in another lua process - require("multi.all") -- now you can do all of your coding with the multi library! You could even spawn more threads from here with the intergration. You would need to require the interaction again though - multi:benchMark(sThread.waitFor("Bench"),nil,"Thread 5"):OnBench(function(self,c) GLOBAL["T5"]=c multi:Stop() end) - multi:mainloop() -end) -multi:newSystemThread("test6",function() -- spawns a thread in another lua process - require("multi.all") -- now you can do all of your coding with the multi library! You could even spawn more threads from here with the intergration. You would need to require the interaction again though - multi:benchMark(sThread.waitFor("Bench"),nil,"Thread 6"):OnBench(function(self,c) GLOBAL["T6"]=c multi:Stop() end) - multi:mainloop() - print("Bench: ",comma_value(tostring(sThread.waitFor("T1")+sThread.waitFor("T2")+sThread.waitFor("T3")+sThread.waitFor("T4")+sThread.waitFor("T5")+sThread.waitFor("T6")))) - GLOBAL["DONE"]=true -end) -multi:newThread("test0",function() - -- sThread.waitFor("DONE") -- lets hold the main thread completely so we don't eat up cpu - -- os.exit() - -- when the main thread is holding there is a chance that error handling on the system threads may not work! - -- instead we can do this - while true do - thread.skip(1) -- allow error handling to take place... Otherwise lets keep the main thread running on the low - sThread.sleep(.001) -- Sleeping for .001 is a greeat way to keep cpu usage down. Make sure if you aren't doing work to rest. Abuse the hell out of GLOBAL if you need to :P - if GLOBAL["DONE"] then - os.exit() - end - end -end) -GLOBAL["Bench"]=60 -multi:mainloop() diff --git a/examples/lanesintegratetest3.lua b/examples/lanesintegratetest3.lua deleted file mode 100644 index dbee63f..0000000 --- a/examples/lanesintegratetest3.lua +++ /dev/null @@ -1,48 +0,0 @@ -package.path="?/init.lua;?.lua;"..package.path -- Spawing threads using 1 method and the sThread.getCores() function! -local GLOBAL,sThread=require("multi.integration.lanesManager").init() -- loads the lanesManager and includes the entire multi library -local function comma_value(amount) - local formatted = amount - while true do - formatted, k = string.gsub(formatted, "^(-?%d+)(%d%d%d)", '%1,%2') - if (k==0) then - break - end - end - return formatted -end -GLOBAL["BENCHCOUNT"],GLOBAL["CNUM"],GLOBAL["DONE"]=0,0,0 -cores=sThread.getCores() -function benchmark() -- our single function that will be used across a bunch of threads - require("multi.all") -- get the library - local n=GLOBAL["CNUM"]; GLOBAL["CNUM"]=n+1 -- do some math so we can identify which thread is which - multi:benchMark(sThread.waitFor("BENCH"),nil,"Thread "..n+1):OnBench(function(self,c) GLOBAL["BENCHCOUNT"]=GLOBAL["BENCHCOUNT"]+c; GLOBAL["DONE"]=GLOBAL["DONE"]+1; multi:Stop() end) - -- ^ do the bench mark and add to the BENCHCOUNT GLOBAL value, then increment the DONE Value - multi:mainloop() -end -for i=1,cores do -- loop based on the number of cores you have - multi:newSystemThread("test"..i,benchmark) -- create a system thread based on the benchmark -end -multi:newThread("test0",function() - while true do - thread.skip(1) - sThread.sleep(.001) - if GLOBAL["DONE"]==cores then - print(comma_value(tostring(GLOBAL["BENCHCOUNT"]))) - os.exit() - end - end -end) -GLOBAL["BENCH"]=1 -print("Platform is: ",multi:getPlatform()) -- returns love2d or lanes depending on which platform you are using... If I add more intergrations then this method will be updated! corona sdk may see this library in the future... -multi:mainloop() ---[[ Output on my machine! I am using luajit and have 6 cores on my computer. Your numbers will vary, but it should look something like this -Intergrated Lanes! -Platform is: lanes -Thread 1 62442125 Steps in 10 second(s)! -Thread 2 61379095 Steps in 10 second(s)! -Thread 3 62772502 Steps in 10 second(s)! -Thread 4 62740684 Steps in 10 second(s)! -Thread 5 60926715 Steps in 10 second(s)! -Thread 6 61793175 Steps in 10 second(s)! -372,054,296 -]] diff --git a/examples/lanesintegratetest4.lua b/examples/lanesintegratetest4.lua deleted file mode 100644 index 40be2c4..0000000 --- a/examples/lanesintegratetest4.lua +++ /dev/null @@ -1,27 +0,0 @@ -local GLOBAL,sThread=require("multi.integration.lanesManager").init() -queue=multi:newSystemThreadedQueue("QUEUE"):init() -queue:push("This is a test") -queue:push("This is a test2") -queue:push("This is a test3") -queue:push("This is a test4") -multi:newSystemThread("test2",function() - queue=sThread.waitFor("QUEUE"):init() - data=queue:pop() - while data do - print(data) - data=queue:pop() - end - queue:push("This is a test5") - queue:push("This is a test6") - queue:push("This is a test7") - queue:push("This is a test8") -end) -multi:newThread("test!",function() -- this is a lua thread - thread.sleep(.1) - data=queue:pop() - while data do - print(data) - data=queue:pop() - end -end) -multi:mainloop() diff --git a/examples/lanesintegratetest5.lua b/examples/lanesintegratetest5.lua deleted file mode 100644 index 7e0898a..0000000 --- a/examples/lanesintegratetest5.lua +++ /dev/null @@ -1,28 +0,0 @@ -package.path="?/init.lua;"..package.path -- slightly different usage of the code -local GLOBAL,sThread=require("multi.integration.lanesManager").init() -queue=multi:newSystemThreadedQueue("QUEUE") -queue:push(1) -queue:push(2) -queue:push(3) -queue:push(4) -queue:push(5) -queue:push(6) -multi:newSystemThread("STHREAD_1",function() - queue=sThread.waitFor("QUEUE"):init() - GLOBAL["QUEUE"]=nil - data=queue:pop() - while data do - print(data) - data=queue:pop() - end -end) -multi:newThread("THREAD_1",function() - while true do - if GLOBAL["QUEUE"]==nil then - print("Deleted a Global!") - break - end - thread.skip(1) - end -end) -multi:mainloop() diff --git a/examples/lanesintegratetest6.lua b/examples/lanesintegratetest6.lua deleted file mode 100644 index 5b7443c..0000000 --- a/examples/lanesintegratetest6.lua +++ /dev/null @@ -1,14 +0,0 @@ --- lanes Desktop lua! NOTE: this is in lanesintergratetest6.lua in the examples folder -local GLOBAL,sThread=require("multi.integration.lanesManager").init() -test=multi:newSystemThreadedTable("YO"):init() -test["test1"]="lol" -multi:newSystemThread("test",function() - tab=sThread.waitFor("YO"):init() - print(tab["test1"]) - sThread.sleep(3) - tab["test2"]="Whats so funny?" -end) -multi:newThread("test2",function() - print(test:waitFor("test2")) -end) -multi:mainloop() diff --git a/examples/lanesintegratetest7.lua b/examples/lanesintegratetest7.lua deleted file mode 100644 index a77c05b..0000000 --- a/examples/lanesintegratetest7.lua +++ /dev/null @@ -1,29 +0,0 @@ --- Creating the object using lanes manager to show case this. Examples has the file for love2d -local GLOBAL,sThread=require("multi.integration.lanesManager").init() -jQueue=multi:newSystemThreadedJobQueue(n) -- this internally creates System threads. By defualt it will use the # of processors on your system You can set this number though. --- Only create 1 jobqueue! For now making more than 1 is buggy. You only really need one though. Just register new functions if you want 1 queue to do more. The one reason though is keeping track of jobIDs. I have an idea that I will roll out in the next update. -jQueue:registerJob("TEST_JOB",function(a,s) - math.randomseed(s) - -- We will push a random # - TEST_JOB2() -- You can call other registered functions as well! - return math.random(0,255) -- send the result to the main thread -end) -jQueue:registerJob("TEST_JOB2",function() - print("Test Works!") -- this is called from the job since it is registered on the same queue -end) -jQueue:start() -tableOfOrder={} -- This is how we will keep order of our completed jobs. There is no guarantee that the order will be correct -jQueue.OnJobCompleted(function(JOBID,n) -- whenever a job is completed you hook to the event that is called. This passes the JOBID folled by the returns of the job - -- JOBID is the completed job, starts at 1 and counts up by 1. - -- Threads finish at different times so jobids may be passed out of order! Be sure to have a way to order them - tableOfOrder[JOBID]=n -- we order ours by putting them into a table - if #tableOfOrder==10 then - print("We got all of the pieces!") - end -end) --- LEts push the jobs now -for i=1,10 do -- Job Name of registered function, ... varargs - jQueue:pushJob("TEST_JOB","This is a test!",math.random(1,1000000)) -end -print("I pushed all of the jobs :)") -multi:mainloop() -- Start the main loop :D diff --git a/examples/lanesintegratetest8.lua b/examples/lanesintegratetest8.lua deleted file mode 100644 index c64586a..0000000 --- a/examples/lanesintegratetest8.lua +++ /dev/null @@ -1,11 +0,0 @@ -package.path="../?.lua;../?/init.lua;"..package.path -local GLOBAL,sThread=require("multi.integration.lanesManager").init() -cmd=multi:newSystemThreadedExecute("SystemThreadedExecuteTest.lua") -- This file is important! -cmd.OnCMDFinished(function(code) -- callback function to grab the exit code... Called when the command goes through - print("Got Code: "..code) -end) -multi:newTLoop(function() - print("...") -end,1) -multi:mainloop() - diff --git a/examples/lanesintegratetest9.lua b/examples/lanesintegratetest9.lua deleted file mode 100644 index a9f7a22..0000000 --- a/examples/lanesintegratetest9.lua +++ /dev/null @@ -1,27 +0,0 @@ ---~ package.path="?/init.lua;"..package.path -local GLOBAL,sThread=require("multi.integration.lanesManager").init() -jQueue=multi:newSystemThreadedJobQueue(n) -jQueue:registerJob("TEST_JOB",function(a,s) - math.randomseed(s) - TEST_JOB2() - return math.random(0,255) -end) -jQueue:registerJob("TEST_JOB2",function() - print("Test Works!") -end) -jQueue:start() -jQueue.OnReady:holdUT() -jQueue:doToAll(function() - print("Doing this 16? times!") -end) -for i=1,10 do -- Job Name of registered function, ... varargs - jQueue:pushJob("TEST_JOB","This is a test!",math.random(1,1000000)) -end -tableOfOrder={} -jQueue.OnJobCompleted(function(JOBID,n) - tableOfOrder[JOBID]=n - if #tableOfOrder==10 then - print("We got all of the pieces!") - end -end) -multi:mainloop() diff --git a/examples/loopTest.lua b/examples/loopTest.lua deleted file mode 100644 index 138d8ba..0000000 --- a/examples/loopTest.lua +++ /dev/null @@ -1,9 +0,0 @@ --- like the while loop (kinda) -require("multi") -loop=multi:newLoop(function(self,dt) - if dt>10 then - print("Enough time has passed!") - self:Break() -- lets break this thing - end -end) -multi:mainloop() diff --git a/examples/love2d Threading Example/GuiManagerDebug/Core/Clickable.int b/examples/love2d Threading Example/GuiManagerDebug/Core/Clickable.int deleted file mode 100644 index f192d8e..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Core/Clickable.int +++ /dev/null @@ -1,15 +0,0 @@ -function gui:Clickable() - local x,y,w,h=love.graphics.getScissor() - local mx=love.mouse.getX() - local my=love.mouse.getY() - if _GuiPro.HasStencel then - local obj=_GuiPro.StencelHolder - if self:isDescendant(obj) then - return math.sqrt((mx-obj.x)^2+(my-obj.y)^2)<=(obj.offset.size.x or 0) - end - end - if not(x) then - return true - end - return not(mx>x+w or mxy+h or myx+w or mxy+h or my self.x and x < self.x+self.width and y > self.y and y < self.y+self.height and self:TClickable(x,y) and self:eventable()) - end - end - self.id=-1 -end -multi:newTask(function() -- A bit of post-loading haha - gui.touchpressed=multi:newConnection() - gui.touchreleased=multi:newConnection() - gui.touchmoved=multi:newConnection() - love.touchpressed=Library.convert(love.touchpressed or function() end) - love.touchreleased=Library.convert(love.touchreleased or function() end) - love.touchmoved=Library.convert(love.touchmoved or function() end) - love.touchpressed:inject(function(id, x, y, dx, dy, pressure) gui.touchpressed:Fire(id, x, y, dx, dy, pressure) return {id, x, y, dx, dy, pressure} end,1) - love.touchreleased:inject(function(id, x, y, dx, dy, pressure) gui.touchreleased:Fire(id, x, y, dx, dy, pressure) return {id, x, y, dx, dy, pressure} end,1) - love.touchmoved:inject(function(id, x, y, dx, dy, pressure) gui.touchmoved:Fire(id, x, y, dx, dy, pressure) return {id, x, y, dx, dy, pressure} end,1) - _GuiPro.TouchReady=true - _GuiPro.TouchRegister={} - gui.touchpressed:connect(function(id, x, y, dx, dy, pressure) - for i,v in pairs(_GuiPro.TouchRegister) do - if #v.tid==0 then - if (x > v.x and x < v.x+v.width and y > v.y and y < v.y+v.height and v:TClickable(x,y) and v:eventable()) then - v:addTID(id) - v.touchcount=1 - for i=1,#v.ToFuncP do - v.ToFuncP[i](v,id, x-v.x, y-v.y, dx, dy or 0, pressure or 1) - end - end - elseif not(v:hasTID(id)) then - if (x > v.x and x < v.x+v.width and y > v.y and y < v.y+v.height and v:TClickable(x,y) and v:eventable()) then - v:addTID(id) - v.touchcount=v.touchcount+1 - for i=1,#v.ToFuncP do - v.ToFuncP[i](v,id, x-v.x, y-v.y, dx, dy or 0, pressure or 1) - end - end - end - end - end) - gui.touchreleased:connect(function(id, x, y, dx, dy, pressure) - for i,v in pairs(_GuiPro.TouchRegister) do - if v:hasTID(id) then - v:removeTID(id) - for i=1,#v.ToFuncR do - v.ToFuncR[i](v,id, x-v.x, y-v.y, dx, dy or 0, pressure or 1) - end - end - end - end) - gui.touchmoved:connect(function(id, x, y, dx, dy, pressure) - for i,v in pairs(_GuiPro.TouchRegister) do - if v:hasTID(id) and (x > v.x and x < v.x+v.width and y > v.y and y < v.y+v.height and v:TClickable(x,y) and v:eventable()) then - for i=1,#v.ToFuncM do - v.ToFuncM[i](v,id, x-v.x, y-v.y, dx, dy or 0, pressure or 1) - end - elseif v:hasTID(id) and not((x > v.x and x < v.x+v.width and y > v.y and y < v.y+v.height and v:TClickable(x,y) and v:eventable())) then - v:removeTID(id) - for i=1,#v.ToFuncR do - v.ToFuncR[i](v,id, x-v.x, y-v.y, dx, dy or 0, pressure or 1) - end - end - end - end) -end) --- now that that is done lets set up some more post loading checks -_GuiPro.int=multi:newProcess() -_GuiPro.int:Start() -_GuiPro.int:setJobSpeed(.001) -_GuiPro.EXACT=0 -_GuiPro.LAX=.01 -_GuiPro.LAZY=.05 --- now lets define the reg function -function gui.Compare(a,b,v,tp) - if tp==">" then - if (a+v>b or a-v>b) then - return true - end - elseif tp=="<" then - if (a+v=" then - if (a+v>=b or a-v>=b) then - return true - end - elseif tp=="==" then -- this one is gonna be tricky - if (a>=b-v and a<=b+v) or (b>=a-v and b<=a+v) then - return true - end - end - return false -end -function gui:regesterTouch() - local obj=self - obj.ToFuncP={} - obj.ToFuncM={} - obj.ToFuncR={} - obj.To2Func={} - obj.ToDTFunc={} - obj.touchRendering =_GuiPro.EXACT -- exact(0), lax(), # - function obj:removeTID(id) - for i=1,#self.tid do - if self.tid[i]==id then - table.remove(self.tid,i) - self.touchcount=self.touchcount-1 - return - end - end - end - function obj:hasTID(id) - for i=1,#self.tid do - if self.tid[i]==id then - return true - end - end - return false - end - obj.txl1=0 - obj.tyl1=0 - obj.txl2=0 - obj.tyl2=0 - obj.LS=0 - obj:OnUpdate(function(self) - if self.touchcount==2 then - local x1,y1=love.touch.getPosition( self.tid[1] ) - local x2,y2=love.touch.getPosition( self.tid[2] ) - local CS=math.sqrt((x2-x1)^2+(y2-y1)^2) - if gui.Compare(CS,self.LS,self.touchRendering,">") then - for i=1,#self.To2Func do - self.To2Func[i](self,CS,x1-self.x,y1-self.y,x2-self.x,y2-self.y) - end - elseif gui.Compare(CS,self.LS,self.touchRendering,"<") then - for i=1,#self.To2Func do - self.To2Func[i](self,-CS,x1-self.x,y1-self.y,x2-self.x,y2-self.y) - end - elseif gui.Compare(CS,self.LS,self.touchRendering,"==") then - for i=1,#self.To2Func do - self.To2Func[i](self,0,x1-self.x,y1-self.y,x2-self.x,y2-self.y) - end - end - -- if self.txl1~=x1 or self.txl2~=x2 or self.tyl1~=y1 or self.tyl2~=y2 then - -- for i=1,#self.To2Func do - -- self.To2Func[i](self,0,x1-self.x,y1-self.y,x2-self.x,y2-self.y) - -- end - -- end - self.LS=CS - self.txl1=x1 - self.txl2=x2 - self.tyl1=y1 - self.tyl2=y2 - end - end) - function obj:OnDoubleTap(func) - table.insert(self.ToDTFunc,func) - end - function obj:On2TouchMoved(func) - table.insert(self.To2Func,func) - end - function obj:addTID(id) - table.insert(self.tid,id) - end - function obj:OnTouchPressed(func) - table.insert(self.ToFuncP,func) -- event for touches - end - function obj:OnTouchReleased(func) -- event for touches - table.insert(self.ToFuncR,func) - end - function obj:OnTouchMoved(func) -- event for touches - table.insert(self.ToFuncM,func) - end - if _GuiPro.TouchReady then -- my sneaky test - print("Registred: "..tostring(obj)) - table.insert(_GuiPro.TouchRegister,obj) - else - print("Attempting to register: "..tostring(obj)) - _GuiPro.int:newJob(function() table.insert(_GuiPro.TouchRegister,obj) end) -- a sneaky way to ensure that your object gets registered eventually, even if you call the method before the touch patch was activated. - end -end diff --git a/examples/love2d Threading Example/GuiManagerDebug/Drawing/AddDrawRuleB.int b/examples/love2d Threading Example/GuiManagerDebug/Drawing/AddDrawRuleB.int deleted file mode 100644 index 5510a3d..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Drawing/AddDrawRuleB.int +++ /dev/null @@ -1,4 +0,0 @@ -function gui:AddDrawRuleB(rule) - if not(self.DrawRulesB) then self.DrawRulesB={} end - table.insert(self.DrawRulesB,rule) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Drawing/AddDrawRuleE.int b/examples/love2d Threading Example/GuiManagerDebug/Drawing/AddDrawRuleE.int deleted file mode 100644 index a025f89..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Drawing/AddDrawRuleE.int +++ /dev/null @@ -1,4 +0,0 @@ -function gui:AddDrawRuleE(rule) - if not(self.DrawRulesE) then self.DrawRulesE={} end - table.insert(self.DrawRulesE,rule) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Drawing/draw.int b/examples/love2d Threading Example/GuiManagerDebug/Drawing/draw.int deleted file mode 100644 index d0b2404..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Drawing/draw.int +++ /dev/null @@ -1,12 +0,0 @@ -function gui:draw() - if _GuiPro.rotate~=0 then - love.graphics.rotate(math.rad(_GuiPro.rotate)) - end - if self.FormFactor:lower()=="rectangle" then - self:drawR() - elseif self.FormFactor:lower()=="circle" then - self:drawC() - else - error("Unsupported FormFactor: "..self.FormFactor.."!") - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Drawing/drawC.int b/examples/love2d Threading Example/GuiManagerDebug/Drawing/drawC.int deleted file mode 100644 index 1f299a7..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Drawing/drawC.int +++ /dev/null @@ -1,89 +0,0 @@ -function gui:drawC() - if love.mouse.isDown("l")==false and love.mouse.isDown("m")==false and love.mouse.isDown("r")==false then - _GuiPro.DragItem={} - _GuiPro.hasDrag=false - end - if self.Visible==true and self.VIS==true then - local b=true - for i,v in pairs(_GuiPro.Clips) do - if self:isDescendant(v)==true then - b=false - end - end - if b then - love.graphics.setStencilTest( ) - _GuiPro.HasStencel=false - _GuiPro.StencelHolder=nil - end - local x,y,r,s=(self.offset.pos.x or 0)+self.Parent.x,(self.offset.pos.y or 0)+self.Parent.y,self.offset.size.x or 0,self.offset.size.y or 360 - if self.CC then - x,y=x+r,y+r - end - self.x,self.y=x,y - _GuiPro.circleStencilFunction = function() - love.graphics.circle("fill",x,y,r,s) - end - if math.sqrt((love.mouse.getX()-x)^2+(love.mouse.getY()-y)^2)<=r and self:eventable() and self:Clickable() and self.Active==true then - self.hovering=true - if love.mouse.isDown("l") and _GuiPro.hasDrag==false then - if string.find(self.Type, "Button") then - love.graphics.setColor(self.Color[1]-10, self.Color[2]-10, self.Color[3]-10,self.Visibility) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility) - end - self.lclicked=true - elseif love.mouse.isDown("r") and _GuiPro.hasDrag==false then - if string.find(self.Type, "Button") then - love.graphics.setColor(self.Color[1]-10, self.Color[2]-10, self.Color[3]-10,self.Visibility) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility) - end - self.rclicked=true - elseif love.mouse.isDown("m") and _GuiPro.hasDrag==false then - if string.find(self.Type, "Button") then - love.graphics.setColor(self.Color[1]-10, self.Color[2]-10, self.Color[3]-10,self.Visibility) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility) - end - self.mclicked=true - else - if string.find(self.Type, "Button") and _GuiPro.hasDrag==false then - love.graphics.setColor(self.Color[1]-5, self.Color[2]-5, self.Color[3]-5,self.Visibility) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility) - end - self.rclicked=false - self.lclicked=false - self.mclicked=false - end - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility) - self.hovering=false - self.rclicked=false - self.lclicked=false - self.mclicked=false - end - if self.ClipDescendants==true then - _GuiPro.Clips[tostring(self)]=self - _GuiPro.HasStencel=true - _GuiPro.StencelHolder=self - love.graphics.stencil(_GuiPro.circleStencilFunction) - love.graphics.setStencilTest("notequal",0) - end - love.graphics.circle("fill",x,y,r,s) - love.graphics.setColor(self.BorderColor[1], self.BorderColor[2], self.BorderColor[3],self.Visibility) - for b=0,self.BorderSize-1 do - love.graphics.circle("line",x,y,r+b,s) - end - if string.find(self.Type, "Text") then - if self.text~=nil then - if self.AutoScaleText then - self.FontSize=math.floor(self.height/1.45833) - end - love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility) - love.graphics.setFont(self.Font) - love.graphics.printf(self.text, x-(r/2)+(self.XTween), y-(r/2)+self.Tween, r, self.TextFormat) - end - end - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Drawing/drawR.int b/examples/love2d Threading Example/GuiManagerDebug/Drawing/drawR.int deleted file mode 100644 index 36b07c3..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Drawing/drawR.int +++ /dev/null @@ -1,131 +0,0 @@ -function gui:drawR() - if love.mouse.isDown("l")==false and love.mouse.isDown("m")==false and love.mouse.isDown("r")==false then - _GuiPro.DragItem={} - _GuiPro.hasDrag=false - end - if self.Visible==true and self.VIS==true then - local b=true - for i,v in pairs(_GuiPro.Clips) do - if self:isDescendant(v)==true then - b=false - end - end - if b==true then - love.graphics.setStencilTest() - love.graphics.setScissor() - end - self.x=(self.Parent.width*self.scale.pos.x)+self.offset.pos.x+self.Parent.x - self.y=(self.Parent.height*self.scale.pos.y)+self.offset.pos.y+self.Parent.y - self.width=(self.Parent.width*self.scale.size.x)+self.offset.size.x - self.height=(self.Parent.height*self.scale.size.y)+self.offset.size.y - if self.DrawRulesB then - for dr=1,#self.DrawRulesB do - self.DrawRulesB[dr](self) - end - end - if (love.mouse.getX() > self.x and love.mouse.getX() < self.x+self.width and love.mouse.getY() > self.y and love.mouse.getY() < self.y+self.height and self:Clickable() and self:eventable()) or self:touchable("r") and self.Active==true then - self.hovering=true - if love.mouse.isDown("l") or self:touchable("r") and _GuiPro.hasDrag==false then - if string.find(self.Type, "Button") then - love.graphics.setColor(self.Color[1]-10, self.Color[2]-10, self.Color[3]-10,self.Visibility) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility) - end - self.lclicked=true - elseif love.mouse.isDown("r") or self:touchable("r") and _GuiPro.hasDrag==false then - if string.find(self.Type, "Button") then - love.graphics.setColor(self.Color[1]-10, self.Color[2]-10, self.Color[3]-10,self.Visibility) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility) - end - self.rclicked=true - elseif love.mouse.isDown("m") or self:touchable("r") and _GuiPro.hasDrag==false then - if string.find(self.Type, "Button") then - love.graphics.setColor(self.Color[1]-10, self.Color[2]-10, self.Color[3]-10,self.Visibility) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility) - end - self.mclicked=true - else - if string.find(self.Type, "Button") or self:touchable("r") and _GuiPro.hasDrag==false then - love.graphics.setColor(self.Color[1]-5, self.Color[2]-5, self.Color[3]-5,self.Visibility) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility) - end - self.rclicked=false - self.lclicked=false - self.mclicked=false - end - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility) - self.hovering=false - self.rclicked=false - self.lclicked=false - self.mclicked=false - end - if self.ClipDescendants==true then - _GuiPro.Clips[tostring(self)]=self - love.graphics.setScissor(self.x, self.y, self.width, self.height) - end - if self:hasRoundness() then - love.graphics.stencil(self.stfunc, "replace", 1) - love.graphics.setStencilTest("greater", 0) - end - - love.graphics.rectangle("fill", self.x, self.y, self.width, self.height,(self.rx or 1)*self.DPI,(self.ry or 1)*self.DPI,(self.segments or 1)*self.DPI) - if string.find(self.Type, "Image") then - self:ImageRule() - end - if self.Type=="Video" then - self:VideoRule() - end - if self:hasRoundness() then - love.graphics.setStencilTest() - end - love.graphics.setColor(self.BorderColor[1], self.BorderColor[2], self.BorderColor[3],self.Visibility) - for b=0,self.BorderSize-1 do - love.graphics.rectangle("line", self.x-(b/2), self.y-(b/2), self.width+b, self.height+b,(self.rx or 1)*self.DPI,(self.ry or 1)*self.DPI,(self.segments or 1)*self.DPI) - end - if string.find(self.Type, "Text") then - if self.text~=nil then - if self.AutoScaleText then - self.FontSize=math.floor(self.height/1.45833) - end - love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility) - if self.Font==_defaultfont then - love.graphics.setFont(self.Font) - love.graphics.printf( - self.text, - (self.x+2+(self.marginL or 0) or self.XTween)*self.DPI, - (self.y+math.floor((self.FontHeight-self.FontSize)/2)+self.Tween)*self.DPI, - (self.width+(0 or (self.marginR or 0)))*self.DPI, - self.TextFormat, - self.TextRotation) - else - if type(self.Font)=="string" then - self.Font=love.graphics.newFont(self.Font,self.FontSize) - self.FontHeight=self.Font:getHeight() - else - love.graphics.setFont(self.Font) - end - if type(self.FontSize)=="string" then - self.FontSize=tonumber(self.FontSize) - love.graphics.setNewFont(self.FontSize) - end - love.graphics.printf( - self.text, - (self.x+2+(self.marginL or 0) or self.XTween)*self.DPI, - (self.y+math.floor((self.FontHeight-self.FontSize)/2)+self.Tween)*self.DPI, - (self.width+(0 or (self.marginR or 0)))*self.DPI, - self.TextFormat, - self.TextRotation) - end - end - end - if self.DrawRulesE then - for dr=1,#self.DrawRulesE do - self.DrawRulesE[dr](self) - end - end - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Frame/newDropFrame.int b/examples/love2d Threading Example/GuiManagerDebug/Frame/newDropFrame.int deleted file mode 100644 index 97e4720..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Frame/newDropFrame.int +++ /dev/null @@ -1,37 +0,0 @@ -function gui:newDropFrame(name,x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("DropFrame",name, x, y, w, h, sx ,sy ,sw ,sh) - c.WasBeingDragged=false - c.IsBeingDragged=false - c.Draggable=false - c.funcD={} - function c:GetDroppedItems() - local t=self:getChildren() - local tab={} - for i=1,#t do - if t[i].Type=="TextImageButtonFrameDrag" then - table.insert(tab,t[i]) - end - end - return tab - end - function c:OnDropped(func) - table.insert(self.funcD,func) - end - c:OnUpdate(function(self) - if _GuiPro.DragItem then - if _GuiPro.DragItem.Type=="TextImageButtonFrameDrag" and love.mouse.isDown(_GuiPro.DragItem.dragbut or "m")==false and self:IsHovering() then - local t=_GuiPro.DragItem - _GuiPro.DragItem={} - for i=1,#t.funcD do - t.funcD[i](self,t) - end - for i=1,#self.funcD do - self.funcD[i](self,t) - end - _GuiPro.hasDrag=false - end - end - end) - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Frame/newFrame.int b/examples/love2d Threading Example/GuiManagerDebug/Frame/newFrame.int deleted file mode 100644 index 5e6b084..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Frame/newFrame.int +++ /dev/null @@ -1,8 +0,0 @@ -function gui:newFrame(name,x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("Frame",name, x, y, w, h, sx ,sy ,sw ,sh) - c.WasBeingDragged=false - c.IsBeingDragged=false - c.Draggable=false - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Frame/newFullFrame.int b/examples/love2d Threading Example/GuiManagerDebug/Frame/newFullFrame.int deleted file mode 100644 index 5cda200..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Frame/newFullFrame.int +++ /dev/null @@ -1,4 +0,0 @@ -function gui:newFullFrame(name) - name=name or "" - return self:newFrame(name,0,0,0,0,0,0,1,1) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Frame/newTabFrame.int b/examples/love2d Threading Example/GuiManagerDebug/Frame/newTabFrame.int deleted file mode 100644 index 9f8f8fe..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Frame/newTabFrame.int +++ /dev/null @@ -1,59 +0,0 @@ -function gui:newTabFrame(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=gui:newFrame(name, x, y, w, h, sx ,sy ,sw ,sh) - c.tabheight=20 - c.Holder=c:newFrame("Holder",0,c.tabheight,0,0,0,0,1,1) - c.TabHolder=c:newFrame("TabHolder",0,0,0,c.tabheight,0,0,1) - function c:setTabHeight(n) - self.tabheight=n - self.Holder:SetDualDim(0,-self.tabheight,0,0,0,0,1,1) - end - function c:addTab(name,colorT,colorH) - if colorT and not(colorH) then - colorH=colorT - end - local tab=self.TabHolder:newTextButton(name,name,0,0,0,0,0,0,0,1) - tab.Tween=-3 - if colorT then - tab.Color=colorT - end - local holder=self.Holder:newFrame(name,0,0,0,0,0,0,1,1) - if colorH then - holder.Color=colorH - end - tab.frame=holder - tab:OnReleased(function(b,self) - if b=="l" then - local tt=self.Parent:getChildren() - local th=self.Parent.Parent.Holder:getChildren() - for i=1,#th do - th[i].Visible=false - end - for i=1,#tt do - tt[i].frame.Visible=false - tt[i].BorderSize=1 - end - self.BorderSize=0 - self.frame.Visible=true - end - end) - local tt=self.TabHolder:getChildren() - for i=1,#tt do - tt[i].frame.Visible=false - tt[i].BorderSize=1 - end - tab.frame.Visible=true - tab.BorderSize=0 - return tab,holder - end - c:OnUpdate(function(self) - local th=self.TabHolder:getChildren() - local l=self.width/#th - for i=1,#th do - th[i]:SetDualDim(l*(i-1),0,l) - end - if #th==0 then - self:Destroy() - end - end) - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Frame/newratioFrame.int b/examples/love2d Threading Example/GuiManagerDebug/Frame/newratioFrame.int deleted file mode 100644 index e69de29..0000000 diff --git a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/SetImage.int b/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/SetImage.int deleted file mode 100644 index 3a1b2fb..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/SetImage.int +++ /dev/null @@ -1,13 +0,0 @@ -function gui:SetImage(i) - if type(i)=="string" or tostring(i):find("ImageData") then - self.Image=love.graphics.newImage(i) - else - self.Image=i - end - if self.Image then - self.ImageHeigth=self.Image:getHeight() - self.ImageWidth=self.Image:getWidth() - self.Quad=love.graphics.newQuad(0,0,self.width,self.height,self.ImageWidth,self.ImageHeigth) - end - return self.ImageWidth,self.ImageHeigth -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/UpdateImage.int b/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/UpdateImage.int deleted file mode 100644 index be4cfd7..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/UpdateImage.int +++ /dev/null @@ -1,5 +0,0 @@ -function gui:UpdateImage() - self.ImageHeigth=self.Image:getHeight() - self.ImageWidth=self.Image:getWidth() - self.Quad=love.graphics.newQuad(0,0,self.width,self.height,self.ImageWidth,self.ImageHeigth) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/getTile.int b/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/getTile.int deleted file mode 100644 index 6b6fcae..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/getTile.int +++ /dev/null @@ -1,20 +0,0 @@ -function gui:getTile(i,x,y,w,h)-- returns imagedata - if type(i)=="string" then - i=love.graphics.newImage(i) - elseif type(i)=="userdata" then - -- do nothing - elseif string.find(self.Type,"Image",1,true) then - local i,x,y,w,h=self.Image,i,x,y,w - else - error("getTile invalid args!!! Usage: ImageElement:getTile(x,y,w,h) or gui:getTile(imagedata,x,y,w,h)") - end - local iw,ih=i:getDimensions() - local id,_id=i:getData(),love.image.newImageData(w,h) - for _x=x,w+x-1 do - for _y=y,h+y-1 do - -- - _id:setPixel(_x-x,_y-y,id:getPixel(_x,_y)) - end - end - return love.graphics.newImage(_id) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newAnim.int b/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newAnim.int deleted file mode 100644 index 30850aa..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newAnim.int +++ /dev/null @@ -1,57 +0,0 @@ -function gui:newAnim(file,delay, x, y, w, h, sx ,sy ,sw ,sh) - local x,y,w,h,sx,sy,sw,sh=filter(file, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("ImageAnimation",file, x, y, w, h, sx ,sy ,sw ,sh) - c.Visibility=0 - c.ImageVisibility=1 - c.delay=delay or .05 - c.files={} - c.AnimStart={} - c.AnimEnd={} - local _files=alphanumsort(love.filesystem.getDirectoryItems(file)) - for i=1,#_files do - if string.sub(_files[i],-1,-1)~="b" then - table.insert(c.files,love.graphics.newImage(file.."/".._files[i])) - end - end - c.step=multi:newTStep(1,#c.files,1,c.delay) - c.step.parent=c - c.rotation=0 - c.step:OnStart(function(step) - for i=1,#step.parent.AnimStart do - step.parent.AnimStart[i](step.parent) - end - end) - c.step:OnStep(function(pos,step) - step.parent:SetImage(step.parent.files[pos]) - end) - c.step:OnEnd(function(step) - for i=1,#step.parent.AnimEnd do - step.parent.AnimEnd[i](step.parent) - end - end) - function c:OnAnimStart(func) - table.insert(self.AnimStart,func) - end - function c:OnAnimEnd(func) - table.insert(self.AnimEnd,func) - end - function c:Pause() - self.step:Pause() - end - function c:Resume() - self.step:Resume() - end - function c:Reset() - self.step.pos=1 - end - function c:getFrames() - return #self.files - end - function c:getFrame() - return self.step.pos - end - function c:setFrame(n) - return self:SetImage(self.files[n]) - end - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newAnimFromData.int b/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newAnimFromData.int deleted file mode 100644 index 02c85c7..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newAnimFromData.int +++ /dev/null @@ -1,52 +0,0 @@ -function gui:newAnimFromData(data,delay, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("ImageAnimation","FromFile", x, y, w, h, sx ,sy ,sw ,sh) - c.Visibility=0 - c.ImageVisibility=1 - c.delay=delay or .05 - c.files=data - c.AnimStart={} - c.AnimEnd={} - c:SetImage(c.files[1]) - c.step=multi:newTStep(1,#c.files,1,c.delay) - c.step.parent=c - c.rotation=0 - c.step:OnStart(function(step) - for i=1,#step.parent.AnimStart do - step.parent.AnimStart[i](step.parent) - end - end) - c.step:OnStep(function(pos,step) - step.parent:SetImage(step.parent.files[pos]) - end) - c.step:OnEnd(function(step) - for i=1,#step.parent.AnimEnd do - step.parent.AnimEnd[i](step.parent) - end - end) - function c:OnAnimStart(func) - table.insert(self.AnimStart,func) - end - function c:OnAnimEnd(func) - table.insert(self.AnimEnd,func) - end - function c:Pause() - self.step:Pause() - end - function c:Resume() - self.step:Resume() - end - function c:Reset() - self.step.pos=1 - end - function c:getFrames() - return #self.files - end - function c:getFrame() - return self.step.pos - end - function c:setFrame(n) - return self:SetImage(self.files[n]) - end - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newAnimFromTiles.int b/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newAnimFromTiles.int deleted file mode 100644 index 70aea2c..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newAnimFromTiles.int +++ /dev/null @@ -1,59 +0,0 @@ -function gui:newAnimFromTiles(file,xd,yd,delay, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(file, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("ImageAnimation",file, x, y, w, h, sx ,sy ,sw ,sh) - local im=love.graphics.newImage(file) - local _x,_y=im:getDimensions() - c.Visibility=0 - c.ImageVisibility=1 - c.delay=delay or .05 - c.files={} - c.AnimStart={} - c.AnimEnd={} - for i=0,_y/yd-1 do - for j=0,_x/xd-1 do - table.insert(c.files,gui:getTile(im,j*xd,i*yd,xd,yd)) - end - end - c:SetImage(c.files[1]) - c.step=multi:newTStep(1,#c.files,1,c.delay) - c.step.parent=c - c.rotation=0 - c.step:OnStart(function(step) - for i=1,#step.parent.AnimStart do - step.parent.AnimStart[i](step.parent) - end - end) - c.step:OnStep(function(pos,step) - step.parent:SetImage(step.parent.files[pos]) - end) - c.step:OnEnd(function(step) - for i=1,#step.parent.AnimEnd do - step.parent.AnimEnd[i](step.parent) - end - end) - function c:OnAnimStart(func) - table.insert(self.AnimStart,func) - end - function c:OnAnimEnd(func) - table.insert(self.AnimEnd,func) - end - function c:Pause() - self.step:Pause() - end - function c:Resume() - self.step:Resume() - end - function c:Reset() - self.step.pos=1 - end - function c:getFrames() - return #self.files - end - function c:getFrame() - return self.step.pos - end - function c:setFrame(n) - return self:SetImage(self.files[n]) - end - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newFullImageLabel.int b/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newFullImageLabel.int deleted file mode 100644 index 953f480..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newFullImageLabel.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:newFullImageLabel(i,name) - return self:newImageLabel(i,name,0,0,0,0,0,0,1,1) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newImageButton.int b/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newImageButton.int deleted file mode 100644 index 5d03572..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newImageButton.int +++ /dev/null @@ -1,25 +0,0 @@ -function gui:newImageButton(i,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("ImageButton",name, x, y, w, h, sx ,sy ,sw ,sh) - if type(i)=="string" or type(i):find("ImageData") then - c.Image=love.graphics.newImage(i) - else - c.Image=i - end - c.Visibility=0 - c.ImageVisibility=1 - c.rotation=0 - if c.Image~=nil then - c.ImageHeigth=c.Image:getHeight() - c.ImageHeight=c.Image:getHeight() - c.ImageWidth=c.Image:getWidth() - c.Quad=love.graphics.newQuad(0,0,w,h,c.ImageWidth,c.ImageHeigth) - end - c:OnEnter(function() - love.mouse.setCursor(_GuiPro.CursorH) - end) - c:OnExit(function() - love.mouse.setCursor(_GuiPro.CursorN) - end) - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newImageLabel.int b/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newImageLabel.int deleted file mode 100644 index c969bf8..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newImageLabel.int +++ /dev/null @@ -1,18 +0,0 @@ -function gui:newImageLabel(i,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("ImageLabel",name, x, y, w, h, sx ,sy ,sw ,sh) - if type(i)=="string" or type(i):find("ImageData") then - c.Image=love.graphics.newImage(i) - else - c.Image=i - end - c.Visibility=0 - c.ImageVisibility=1 - c.rotation=0 - if c.Image then - c.ImageHeigth=c.Image:getHeight() - c.ImageWidth=c.Image:getWidth() - c.Quad=love.graphics.newQuad(0,0,w,h,c.ImageWidth,c.ImageHeigth) - end - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newVideo.int b/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newVideo.int deleted file mode 100644 index de2c379..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Image-Animation/newVideo.int +++ /dev/null @@ -1,62 +0,0 @@ -function gui:newVideo(name,i,x,y,w,h,sx,sy,sw,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("Video",name, x, y, w, h, sx ,sy ,sw ,sh) - if type(i)=="string" then - c.Video=love.graphics.newVideo(i) - else - c.Video=i - end - c.Visibility=0 - c.VideoVisibility=1 - c.rotation=0 - if c.Video~=nil then - c.VideoHeigth=c.Video:getHeight() - c.VideoWidth=c.Video:getWidth() - c.Quad=love.graphics.newQuad(0,0,w,h,c.VideoWidth,c.VideoHeigth) - end - c.funcV={} - function c:Play() - self.handStart=true - self.Video:play() - end - function c:Pause() - self.Video:pause() - end - c.Resume=c.Play - function c:Stop() - self.handStart=false - self:Pause() - self:Rewind() - for i=1,# self.funcV do - self.funcV[i](self) - end - end - function c:OnVideoStopped(func) - table.insert(self.funcV,func) - end - function c:Rewind() - self.Video:rewind() - end - function c:Restart() - self:Rewind() - self:Play() - end - function c:Seek(o) - self.Video:seek(o) - end - function c:Tell() - self.Video:tell() - end - function c:SetFilter(min, mag, anisotropy) - self.Video:setFilter(min, mag, anisotropy) - end - function c:IsPlaying() - return self.Video:isPlaying() - end - c:OnUpdate(function(self) - if self.Video:isPlaying()==false and self.handStart == true then - self:Stop() - end - end) - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Item/newDragItem.int b/examples/love2d Threading Example/GuiManagerDebug/Item/newDragItem.int deleted file mode 100644 index 162341c..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Item/newDragItem.int +++ /dev/null @@ -1,51 +0,0 @@ -function gui:newDragItem(t,i,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("TextImageButtonFrameDrag",name, x, y, w, h, sx ,sy ,sw ,sh) - c.WasBeingDragged=false - c.IsBeingDragged=false - c.Draggable=true - c.funcD={} - if type(i)=="string" then - c.Image=love.graphics.newImage(i) - c.ImageVisibility=1 - c.ImageHeigth=c.Image:getHeight() - c.ImageWidth=c.Image:getWidth() - c.Quad=love.graphics.newQuad(0,0,w,h,c.ImageWidth,c.ImageHeigth) - elseif type(i)=="image" then - c.Image=i - c.ImageVisibility=1 - c.ImageHeigth=c.Image:getHeight() - c.ImageWidth=c.Image:getWidth() - c.Quad=love.graphics.newQuad(0,0,w,h,c.ImageWidth,c.ImageHeigth) - end - c:OnDragStart(function(self,x,y) - if _GuiPro.hasDrag==false then - self:setParent(_GuiPro) - self:SetDualDim(x,y) - self:TopStack() - end - end) - c.rotation=0 - c.Tween=0 - c.XTween=0 - c.text = t - c.AutoScaleText=false - c.FontHeight=_defaultfont:getHeight() - c.Font=_defaultfont - c.FontSize=15 - c.TextFormat="center" - c.TextVisibility=1 - c.TextColor = {0, 0, 0} - function c:OnDropped(func) - table.insert(self.funcD,func) - end - c:OnUpdate(function(self) - if love.mouse.isDown("m" or self.dragbut)==false and self==_GuiPro.DragItem and self.hovering==false then - _GuiPro.DragItem={} - for i=1,#self.func7 do - self.func7[i](self,(love.mouse.getX())-self.width/2,(love.mouse.getY())-self.height/2) - end - end - end) - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Item/newItem.int b/examples/love2d Threading Example/GuiManagerDebug/Item/newItem.int deleted file mode 100644 index 57a68d5..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Item/newItem.int +++ /dev/null @@ -1,28 +0,0 @@ -function gui:newItem(t,i,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("TextImageButtonFrame",name, x, y, w, h, sx ,sy ,sw ,sh) - if type(i)=="string" then - c.Image=love.graphics.newImage(i) - else - c.Image=i - end - c.rotation=0 - c.ImageVisibility=1 - c.Draggable=false - if c.Image~=nil then - c.ImageHeigth=c.Image:getHeight() - c.ImageWidth=c.Image:getWidth() - c.Quad=love.graphics.newQuad(0,0,w,h,c.ImageWidth,c.ImageHeigth) - end - c.Tween=0 - c.XTween=0 - c.text = t - c.AutoScaleText=false - c.FontHeight=_defaultfont:getHeight() - c.Font=_defaultfont - c.FontSize=15 - c.TextFormat="center" - c.TextVisibility=1 -- 0=invisible,1=solid (self.TextVisibility*254+1) - c.TextColor = {0, 0, 0} - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/AdvTextBox.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/AdvTextBox.int deleted file mode 100644 index 08a3499..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/AdvTextBox.int +++ /dev/null @@ -1,45 +0,0 @@ -function gui:AdvTextBox(txt,x,y,w,h,sx,sy,sw,sh) - name="AdvTextBox" - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("AdvTextBoxFrame",name, x, y, w, 30, sx ,sy ,sw ,sh) - c.Draggable=true - c.dragbut="r" - c.BorderSize=0 - c:ApplyGradient{Color.Blue,Color.sexy_purple} - c:newTextLabel(txt,"Holder",0,0,0,h-30,0,1,1,0).Color=Color.sexy_purple - c.funcO={} - c.funcX={} - c:OnDragStart(function(self) - self:TopStack() - end) - --local temp = c:newTextButton("X","Close",-25,5,20,20,1) - --temp.Tween=-5 - --temp.XTween=-2 - --temp:OnReleased(function(b,self) for i=1,#self.Parent.funcX do self.Parent.funcX[i](self.Parent) end end) - --temp.Color=Color.Red - c.tLink=c:newTextBox("puttext","TextBox",5,h-95,-40,30,0,1,1,1) - c.tLink.Color=Color.light_gray - c.tLink.ClearOnFocus=true - c.tLink:OnFocus(function(self) self.ClearOnFocus=false end) - local temp=c:newTextButton("OK","Ok",-35,h-65,30,30,1,1) - temp:OnReleased(function(b,self) for i=1,#self.Parent.funcO do self.Parent.funcO[i](self.Parent,self.Parent.tLink.text) end end) - temp.Color=Color.Green - temp.XTween=-2 - local temp=c:newTextButton("X","Cancel",-35,h-95,30,30,1,1) - temp:OnReleased(function(b,self) for i=1,#self.Parent.funcX do self.Parent.funcX[i](self.Parent,self.Parent.tLink.text) end end) - temp.Color=Color.Red - temp.XTween=-2 - function c:Close() - self.Visible=false - end - function c:Open() - self.Visible=true - end - function c:OnOk(func) - table.insert(self.funcO,func) - end - function c:OnX(func) - table.insert(self.funcX,func) - end - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/ApplyGradient.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/ApplyGradient.int deleted file mode 100644 index 87cb97d..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/ApplyGradient.int +++ /dev/null @@ -1,36 +0,0 @@ -function _GuiPro.gradient(colors) - local direction = colors.direction or "horizontal" - colors.direction=nil - trans = colors.trans or 1 - trans=math.floor(trans) - if direction == "horizontal" then - direction = true - elseif direction == "vertical" then - direction = false - else - error("Invalid direction '" .. tostring(direction) "' for gradient. Horizontal or vertical expected.") - end - local result = love.image.newImageData(direction and 1 or #colors, direction and #colors or 1,"rgba32f") - for __i, color in ipairs(colors) do - local x, y - if direction then - x, y = 0, __i - 1 - else - x, y = __i - 1, 0 - end - result:setPixel(x, y, color[1], color[2], color[3], trans) - end - result = love.graphics.newImage(result) - result:setFilter('linear', 'linear') - return result -end -function _GuiPro.drawinrect(img, x, y, w, h, r, ox, oy, kx, ky) - love.graphics.draw(img, x, y, r, w / img:getWidth(), h / img:getHeight(), ox, oy, kx, ky) -end -function gui:ApplyGradient(rules) - self.Image=nil - self.Type=self.Type.."w/GradImage" - self.rotation=0 - self.ImageVisibility=rules.visibility or 1 - self:SetImage(_GuiPro.gradient(rules)) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/BottomStack.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/BottomStack.int deleted file mode 100644 index b339ec4..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/BottomStack.int +++ /dev/null @@ -1,10 +0,0 @@ -function gui:BottomStack() - childs=self.Parent:getChildren() - for i=1,#childs do - if childs[i]==self then - table.remove(self.Parent.Children,i) - table.insert(self.Parent.Children,1,self) - break - end - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/Center.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/Center.int deleted file mode 100644 index fb22fea..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/Center.int +++ /dev/null @@ -1,4 +0,0 @@ -function gui:center() - self:centerX() - self:centerY() -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/Destroy.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/Destroy.int deleted file mode 100644 index f127af8..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/Destroy.int +++ /dev/null @@ -1,10 +0,0 @@ -function gui:Destroy() - check=self.Parent:getChildren() - local cc=0 - for cc=1,#check do - if check[cc]==self then - table.remove(self.Parent.Children,cc) - end - end - self.Destroyed = true -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/GetAllChildren.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/GetAllChildren.int deleted file mode 100644 index b3a0ae4..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/GetAllChildren.int +++ /dev/null @@ -1,25 +0,0 @@ -function gui:GetAllChildren() - local Stuff = {} - function Seek(Items) - for i=1,#Items do - if Items[i].Visible==true then - table.insert(Stuff,Items[i]) - local NItems = Items[i]:getChildren() - if NItems ~= nil then - Seek(NItems) - end - end - end - end - local Objs = self:getChildren() - for i=1,#Objs do - if Objs[i].Visible==true then - table.insert(Stuff,Objs[i]) - local Items = Objs[i]:getChildren() - if Items ~= nil then - Seek(Items) - end - end - end - return Stuff -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/GetChild.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/GetChild.int deleted file mode 100644 index d434f40..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/GetChild.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:GetChild(name) - return self.Children[name] or self -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/InGrid.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/InGrid.int deleted file mode 100644 index 4e097a7..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/InGrid.int +++ /dev/null @@ -1,3 +0,0 @@ -function InGrid(i,x,y,s) - return math.floor((i-1)/x)*s,(i-1)*s-(math.floor((i-1)/y)*(s*x)) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/InGridX.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/InGridX.int deleted file mode 100644 index c4aadc2..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/InGridX.int +++ /dev/null @@ -1,5 +0,0 @@ -function InGridX(i,w,h,xs,ys) - local xc,yc=math.floor(w/xs),math.floor(h/ys) - local xi,yi=(i-1)%xc,math.floor((i-1)/xc) - return xi*xs,yi*ys -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/InGridY.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/InGridY.int deleted file mode 100644 index 555c72a..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/InGridY.int +++ /dev/null @@ -1,5 +0,0 @@ -function InGridY(i,w,h,xs,ys) - local xc,yc=math.floor(w/xs),math.floor(h/ys) - local xi,yi=math.floor((i-1)/yc),(i-1)%yc - return xi*xs,yi*ys -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/IsHovering.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/IsHovering.int deleted file mode 100644 index 072bb54..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/IsHovering.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:IsHovering() - return (love.mouse.getX() > self.x and love.mouse.getX() < self.x+self.width and love.mouse.getY() > self.y and love.mouse.getY() < self.y+self.height) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/Move.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/Move.int deleted file mode 100644 index 6f32db9..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/Move.int +++ /dev/null @@ -1,4 +0,0 @@ -function gui:Move(x,y) - self.offset.pos.x=self.offset.pos.x+x - self.offset.pos.y=self.offset.pos.y+y -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/SetDualDim.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/SetDualDim.int deleted file mode 100644 index 0774965..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/SetDualDim.int +++ /dev/null @@ -1,46 +0,0 @@ -function gui:SetDualDim(x, y, w, h, sx ,sy ,sw ,sh) - if _GuiPro.DPI_ENABLED then - if x then - x=self.DPI*x - end - if y then - y=self.DPI*y - end - if w then - w=self.DPI*w - end - if h then - h=self.DPI*h - end - end - if sx then - self.scale.pos.x=sx - end - if sy then - self.scale.pos.y=sy - end - if x then - self.offset.pos.x=x - end - if y then - self.offset.pos.y=y - end - if sw then - self.scale.size.x=sw - end - if sh then - self.scale.size.y=sh - end - if w then - self.offset.size.x=w - end - if h then - self.offset.size.y=h - end - if self.Image then - self:SetImage(self.Image) - end -end -function gui:setDualDim(...) - self:SetDualDim(...) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/SetHand.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/SetHand.int deleted file mode 100644 index 8171f2c..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/SetHand.int +++ /dev/null @@ -1,5 +0,0 @@ -_GuiPro.CursorN=love.mouse.getSystemCursor("arrow") -_GuiPro.CursorH=love.mouse.getSystemCursor("hand") -function gui:SetHand(img,x,y) - _GuiPro.CursorN=love.mouse.newCursor(img,x,y) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/SetHover.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/SetHover.int deleted file mode 100644 index 956e593..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/SetHover.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:SetHover(img,x,y) - _GuiPro.CursorH=love.mouse.newCursor(img,x,y) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/SetName.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/SetName.int deleted file mode 100644 index 1e69edd..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/SetName.int +++ /dev/null @@ -1,4 +0,0 @@ -function gui:SetName(name) - self.Parent.Children[name]=self - self.Name=name -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/TopStack.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/TopStack.int deleted file mode 100644 index a1db016..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/TopStack.int +++ /dev/null @@ -1,10 +0,0 @@ -function gui:TopStack() - childs=self.Parent:getChildren() - for i=1,#childs do - if childs[i]==self then - table.remove(self.Parent.Children,i) - table.insert(self.Parent.Children,self) - break - end - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/addDominance.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/addDominance.int deleted file mode 100644 index 5a55975..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/addDominance.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:addDominance() - _GuiPro.TopHovered=self -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/addHotKey.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/addHotKey.int deleted file mode 100644 index 0ec05e0..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/addHotKey.int +++ /dev/null @@ -1,6 +0,0 @@ -function gui:addHotKey(key) - local temp=self:newFrame(0,0,0,0) - temp.Visible=false - temp:setHotKey(key) - return temp -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/alphanumsort.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/alphanumsort.int deleted file mode 100644 index 3b36133..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/alphanumsort.int +++ /dev/null @@ -1,7 +0,0 @@ -function alphanumsort(o) - local function padnum(d) local dec, n = string.match(d, "(%.?)0*(.+)") - return #dec > 0 and ("%.12f"):format(d) or ("%s%03d%s"):format(dec, #n, n) - end - table.sort(o, function(a,b) return tostring(a):gsub("%.?%d+",padnum)..("%3d"):format(#b)< tostring(b):gsub("%.?%d+",padnum)..("%3d"):format(#a) end) - return o -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/anchorRight.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/anchorRight.int deleted file mode 100644 index 91251ad..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/anchorRight.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:anchorRight(n) - self:SetDualDim(-(self.width+n),nil,nil,nil,1) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/centerX.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/centerX.int deleted file mode 100644 index ea1f599..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/centerX.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:centerX() - self:SetDualDim(-(self.width/2),nil,nil,nil,.5) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/centerY.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/centerY.int deleted file mode 100644 index c998589..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/centerY.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:centerY() - self:SetDualDim(nil,-(self.height/2),nil,nil,nil,.5) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/disrespectHierarchy.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/disrespectHierarchy.int deleted file mode 100644 index d25162d..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/disrespectHierarchy.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:disrespectHierarchy() - _GuiPro.Hierarchy=false -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/getChildren.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/getChildren.int deleted file mode 100644 index 295c5fc..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/getChildren.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:getChildren() - return self.Children -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/getColor.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/getColor.int deleted file mode 100644 index bef482e..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/getColor.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:getColor(cindex) - return Color[cindex] -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/getFullSize.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/getFullSize.int deleted file mode 100644 index d2ad2d5..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/getFullSize.int +++ /dev/null @@ -1,12 +0,0 @@ -function gui:getFullSize() - local maxx,maxy=-math.huge,-math.huge - local temp = self:GetAllChildren() - for i=1,#temp do - if temp[i].width+temp[i].offset.pos.x>maxx then - maxx=temp[i].width+temp[i].offset.pos.x - elseif temp[i].height+temp[i].offset.pos.y>maxy then - maxy=temp[i].height+temp[i].offset.pos.y - end - end - return maxx,maxy -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/getHighest.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/getHighest.int deleted file mode 100644 index df7121a..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/getHighest.int +++ /dev/null @@ -1,5 +0,0 @@ -function gui:getHighest() - if self.Children[#self.Children]~=nil then - return self.Children[#self.Children] - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/getLowest.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/getLowest.int deleted file mode 100644 index 5319544..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/getLowest.int +++ /dev/null @@ -1,5 +0,0 @@ -function gui:getLowest() - if self.Children[1]~=nil then - return self.Children[1] - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/isDescendant.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/isDescendant.int deleted file mode 100644 index 5c9c2a5..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/isDescendant.int +++ /dev/null @@ -1,9 +0,0 @@ -function gui:isDescendant(obj) - local things=obj:GetAllChildren() - for i=1,#things do - if things[i]==self then - return true - end - end - return false -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/isHighest.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/isHighest.int deleted file mode 100644 index 0453c16..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/isHighest.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:isHighest() - return (self==self.Parent:getHighest()) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/isLowest.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/isLowest.int deleted file mode 100644 index a210883..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/isLowest.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:isLowest() - return (self==self.Parent:getLowest()) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/massMutate.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/massMutate.int deleted file mode 100644 index 1c75aee..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/massMutate.int +++ /dev/null @@ -1,6 +0,0 @@ -function gui.massMutate(t,...) - local mut={...} - for i=1,#mut do - mut[i]:Mutate(t) - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/newCheckBox.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/newCheckBox.int deleted file mode 100644 index 607d5d9..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/newCheckBox.int +++ /dev/null @@ -1,41 +0,0 @@ -if love.filesystem.getInfo("CheckBoxes.png") then - _GuiPro.UC=gui:getTile("CheckBoxes.png",0,0,16,16) - _GuiPro.C=gui:getTile("CheckBoxes.png",16,0,16,16) - _GuiPro.UCH=gui:getTile("CheckBoxes.png",0,16,16,16) - _GuiPro.CH=gui:getTile("CheckBoxes.png",16,16,16,16) -end -function gui:newCheckBox(name,x,y) - if not(_GuiPro.UC) then error("CheckBoxes.png not found! Cannot currently use checkbox without the data") end - if type(name)~="String" then - x,y,name=name,x,"CheckBox" - end - local c=self:newImageLabel(_GuiPro.UC,name, x, y, 16,16) - c.Visibility=0 - c.check=false - c:OnEnter(function(self) - if self.check then - self:SetImage(_GuiPro.CH) - else - self:SetImage(_GuiPro.UCH) - end - end) - function c:isChecked() - return self.check - end - c:OnExit(function(self) - if self.check then - self:SetImage(_GuiPro.C) - else - self:SetImage(_GuiPro.UC) - end - end) - c:OnReleased(function(b,self) - self.check=not(self.check) - if self.check then - self:SetImage(_GuiPro.CH) - else - self:SetImage(_GuiPro.UCH) - end - end) - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/newMessageBox.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/newMessageBox.int deleted file mode 100644 index 6b11a5a..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/newMessageBox.int +++ /dev/null @@ -1,36 +0,0 @@ -function gui:newMessageBox(txt,x,y,w,h,sx,sy,sw,sh) - name="MessageBox" - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("MessageBoxFrame",name, x, y, w, 30, sx ,sy ,sw ,sh) - c.Draggable=true - c.dragbut="r" - c:ApplyGradient{Color.Blue,Color.sexy_purple} - c.BorderSize=0 - c:newTextLabel(txt,"Holder",0,0,0,h-30,0,1,1,0).Color=Color.sexy_purple - c.funcO={} - c.funcX={} - c:OnDragStart(function(self) - self:TopStack() - end) - local temp = c:newTextButton("X","Close",-25,5,20,20,1) - temp.Tween=-5 - temp.XTween=-2 - temp:OnReleased(function(b,self) for i=1,#self.Parent.funcX do self.Parent.funcX[i](self.Parent) end end) - temp.Color=Color.Red - local temp=c:newTextButton("OK","Ok",0,h-65,0,30,.25,1,.5) - temp:OnReleased(function(b,self) for i=1,#self.Parent.funcO do self.Parent.funcO[i](self.Parent) end end) - temp.Color=Color.Green - function c:Close() - self.Visible=false - end - function c:Open() - self.Visible=true - end - function c:OnOk(func) - table.insert(self.funcO,func) - end - function c:OnX(func) - table.insert(self.funcX,func) - end - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/newPart.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/newPart.int deleted file mode 100644 index 79bd3e5..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/newPart.int +++ /dev/null @@ -1,49 +0,0 @@ -function gui:newPart(x, y,w ,h , sx ,sy ,sw ,sh) - local c = {} - setmetatable(c, gui) - if self==gui then - c.Parent=_GuiPro - else - c.Parent=self - end - c.funcs={} - c.funcs2={} - c.funcs3={} - c.funcs4={} - c.funcs5={} - c.func6={} - c.func7={} - c.func8={} - c.func9={} - c.func10={} - c.form="rectangle" - c.Color = {255, 255, 255} - c.scale={} - c.scale.size={} - c.scale.size.x=sw or 0 - c.scale.size.y=sh or 0 - c.offset={} - c.offset.size={} - c.offset.size.x=w or 0 - c.offset.size.y=h or 0 - c.scale.pos={} - c.scale.pos.x=sx or 0 - c.scale.pos.y=sy or 0 - c.offset.pos={} - c.offset.pos.x=x or 0 - c.offset.pos.y=y or 0 - c.VIS=true - c.Visible=true - c.Visibility=1 - c.BorderColor={0,0,0} - c.BorderSize=0 - c.Type="Part" - c.Name="GuiPart" - _GuiPro.count=_GuiPro.count+1 - c.x=(c.Parent.width*c.scale.pos.x)+c.offset.pos.x+c.Parent.x - c.y=(c.Parent.height*c.scale.pos.y)+c.offset.pos.y+c.Parent.y - c.width=(c.Parent.width*c.scale.size.x)+c.offset.size.x - c.height=(c.Parent.height*c.scale.size.y)+c.offset.size.y - table.insert(c.Parent.Children,c) - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/newProgressBar.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/newProgressBar.int deleted file mode 100644 index 2f82f9f..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/newProgressBar.int +++ /dev/null @@ -1,45 +0,0 @@ -function gui:newProgressBar(txt,x,y,w,h,sx,sy,sw,sh) - name="newProgressBar" - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("newProgressBarFrame",name, x, y, w, 30, sx ,sy ,sw ,sh) - c.Draggable=true - c.dragbut="r" - c.BorderSize=0 - c:ApplyGradient{Color.Blue,Color.sexy_purple} - c:newTextLabel(txt,"Holder",0,0,0,h-30,0,1,1,0).Color=Color.sexy_purple - c.funcO={} - c.funcX={} - c:OnDragStart(function(self) - self:TopStack() - end) - local temp = c:newTextButton("X","Close",-25,5,20,20,1) - temp.Tween=-5 - temp.XTween=-2 - temp:OnReleased(function(b,self) for i=1,#self.Parent.funcX do self.Parent.funcX[i](self.Parent) end end) - temp.Color=Color.Red - c.BarBG=c:newTextButton("",5,h-65,-10,30,0,1,1) - c.BarBG:ApplyGradient{Color.Red,Color.light_red} - c.Bar=c.BarBG:newTextLabel("",0,0,0,0,0,0,0,1) - c.Bar:ApplyGradient{Color.Green,Color.light_green} - c.BarDisp=c.BarBG:newTextLabel("0%","0%",0,0,0,0,0,0,1,1) - c.BarDisp.Visibility=0 - c.BarDisp.Link=c.Bar - c.BarDisp:OnUpdate(function(self) - self.text=self.Link.scale.size.x*100 .."%" - end) - c.Func1={} - function c:On100(func) - table.insert(self.Func1,func) - end - c:OnUpdate(function(self) - if self.Bar.scale.size.x*100>=100 then - for P=1,#self.Func1 do - self.Func1[P](self) - end - end - end) - function c:SetPercentage(n) - self.Bar:SetDualDim(0,0,0,0,0,0,n/100,1) - end - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/newScrollBar.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/newScrollBar.int deleted file mode 100644 index 6fa810a..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/newScrollBar.int +++ /dev/null @@ -1,42 +0,0 @@ -function gui:newScrollBar(color1,color2) - local scrollbar=self:newFrame(-20,0,20,0,1,0,0,1) - scrollbar.funcS={} - scrollbar.Color=color1 or Color.saddle_brown - scrollbar:OnClicked(function(b,self,x,y) - love.mouse.setX(self.x+10) - if y>=10 and y<=self.height-10 then - self.mover:SetDualDim(0,y-10) - end - if y<10 then - love.mouse.setY(10+self.y) - end - if y>self.height-10 then - love.mouse.setY((self.height-10)+self.y) - end - for i=1,#self.funcS do - self.funcS[i](self,self:getPosition()) - end - end) - scrollbar:OnEnter(function(self) - self:addDominance() - end) - scrollbar:OnExit(function(self) - self:removeDominance() - end) - scrollbar.mover=scrollbar:newTextButton("","",0,0,20,20) - scrollbar.mover.Color=color2 or Color.light_brown - function scrollbar:getPosition() - return ((self.mover.offset.pos.y)/(self.height-20))*100 - end - function scrollbar:setPosition(n) - print((self.height-20),n) - self.mover.offset.pos.y=((self.height-20)/(100/n)) - for i=1,#self.funcS do - self.funcS[i](self,self:getPosition()) - end - end - function scrollbar:OnScroll(func) - table.insert(self.funcS,func) - end - return scrollbar -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/newScrollMenu.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/newScrollMenu.int deleted file mode 100644 index 3dbfdaf..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/newScrollMenu.int +++ /dev/null @@ -1,98 +0,0 @@ -function gui:newScrollMenu(title,tabN,onloop,x, y, w, h, sx ,sy ,sw ,sh) - local Main = self:newFrame(x, y, w, h, sx ,sy ,sw ,sh) - local Title=Main:newTextButton(title,"Title",0,0,0,20,0,0,1) - Title.Tween=-4 - Title.FontSize=12 - Title:OnReleased(function(b,self) - self.Parent.Tick=not(self.Parent.Tick) - end) - local scroll=Main:newTextButton("","Scroll",-20,20,20,-20,1,0,0,1) - scroll:OnClicked(function(b,self,x,y) - self.Parent.Mover:SetDualDim(0,y-10,20,20) - if self.Parent.Mover.offset.pos.y<0 then - self.Parent.Mover:SetDualDim(0,0,20,20) - end - if self.Parent.Mover.offset.pos.y>self.Parent.height-40 then - self.Parent.Mover:SetDualDim(0,self.Parent.height-40,20,20) - end - local temp = #self.Parent.TList - self.Parent.pos=(math.floor((temp*self.Parent.Mover.offset.pos.y)/self.height))+1 - end) - Main:OnUpdate(function(self) - if self.Tick==false then - self.Visibility=0 - end - end) - scroll:OnUpdate(function(self) - self.Visible=self.Parent.Tick - end) - local Mover=scroll:newTextLabel("",0,0,20,20) - Main.Mover=Mover - Main.TList=tabN - Main.pos=1 - Main.Tick=true - function Main:Update(title,tabN,onloop) - ch=self:getChildren() - for i=#ch,1,-1 do - ch[i]:Destroy() - end - Title=Main:newTextButton(title,"Title",0,0,0,20,0,0,1) - Title.Tween=-4 - Title.FontSize=12 - Title:OnReleased(function(b,self) - self.Parent.Tick=not(self.Parent.Tick) - end) - scroll=Main:newTextButton("","Scroll",-20,20,20,-20,1,0,0,1) - scroll:OnClicked(function(b,self,x,y) - self.Parent.Mover:SetDualDim(0,y-10,20,20) - if self.Parent.Mover.offset.pos.y<0 then - self.Parent.Mover:SetDualDim(0,0,20,20) - end - if self.Parent.Mover.offset.pos.y>self.Parent.height-40 then - self.Parent.Mover:SetDualDim(0,self.Parent.height-40,20,20) - end - local temp = #self.Parent.TList - self.Parent.pos=(math.floor((temp*self.Parent.Mover.offset.pos.y)/self.height))+1 - end) - local Mover=scroll:newTextLabel("",0,0,20,20) - Main.Mover=Mover - Main.TList=tabN - Main.pos=1 - Main.Tick=true - scroll:OnUpdate(function(self) - self.Visible=self.Parent.Tick - end) - for i=1,math.floor(Main.height/20)-1 do - local temp=Main:newTextButton("","Item"..i,0,i*20,-20,20,0,0,1) - temp.FontSize=10 - temp.Tween=-4 - temp.pos=i - temp:OnUpdate(function(self) - self.text=self.Parent.TList[(self.Parent.pos+self.pos)-1] - self.Visible=self.Parent.Tick - end) - if onloop then - onloop(temp,i) - end - end - end - io.write(tostring(Main.height).."\n") - for i=1,math.floor(Main.height/20)-1 do - local temp=Main:newTextButton("Item"..i,0,i*20,-20,20,0,0,1) - temp.FontSize=10 - temp.Tween=-4 - temp.pos=i - temp:OnUpdate(function(self) - if self.Parent.TList[(self.Parent.pos+self.pos)-1]~=nil then - self.text=self.Parent.TList[(self.Parent.pos+self.pos)-1] - else - self.text="" - end - self.Visible=self.Parent.Tick - end) - if onloop then - onloop(temp,i) - end - end - return Main -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/removeAllChildren.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/removeAllChildren.int deleted file mode 100644 index 8d0d99e..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/removeAllChildren.int +++ /dev/null @@ -1,6 +0,0 @@ -function gui:destroyAllChildren() - local c=self.Children - for i=1,#c do - c[i]:Destroy() - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/removeDominance.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/removeDominance.int deleted file mode 100644 index c42b2e1..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/removeDominance.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:removeDominance() - _GuiPro.TopHovered=nil -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/respectHierarchy.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/respectHierarchy.int deleted file mode 100644 index 656a992..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/respectHierarchy.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:respectHierarchy() - _GuiPro.Hierarchy=true -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/round.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/round.int deleted file mode 100644 index f06ad57..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/round.int +++ /dev/null @@ -1,4 +0,0 @@ -function gui.round(num, idp) - local mult = 10^(idp or 0) - return math.floor(num * mult + 0.5) / mult -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/setBG.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/setBG.int deleted file mode 100644 index c82f045..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/setBG.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui.setBG(i) - gui.ff:SetImage(i) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/setColor.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/setColor.int deleted file mode 100644 index 7a81a6f..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/setColor.int +++ /dev/null @@ -1,14 +0,0 @@ -function gui:setColor(a,b,c) - if type(a)=="string" then - self.Color=Color[a] - elseif type(a)=="number" then - self.Color=Color.new(a,b,c) - end -end -function gui:setTextColor(a,b,c) - if type(a)=="string" then - self.TextColor=Color[a] - elseif type(a)=="number" then - self.TextColor=Color.new(a,b,c) - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/setDefualtFont.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/setDefualtFont.int deleted file mode 100644 index 001b9f7..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/setDefualtFont.int +++ /dev/null @@ -1,3 +0,0 @@ -function gui:setDefualtFont(font) - _defaultfont = font -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/setHotKey.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/setHotKey.int deleted file mode 100644 index 5866cfc..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/setHotKey.int +++ /dev/null @@ -1,24 +0,0 @@ -function gui:setHotKey(key) - local tab=key:split("+") - self.hotkeys=tab - self.cooldown=false - self.Alarm=multi:newAlarm(1) - self.Alarm.parent=self - self.args={} - self.funcHK=multi:newConnection() - self.Alarm:OnRing(function(alarm) alarm.parent.cooldown=false end) - function self:OnHotKey(func) - self.funcHK:connect(func) - end - self:OnUpdate(function(self) - if self.cooldown then return end - for i=1,#self.hotkeys do - if not(love.keyboard.isDown(self.hotkeys[i])) then - return - end - end - self.cooldown=true - self.funcHK:Fire(self) - self.Alarm:Reset() - end) -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/setNewFont.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/setNewFont.int deleted file mode 100644 index 2ee8adf..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/setNewFont.int +++ /dev/null @@ -1,7 +0,0 @@ -function gui:setNewFont(FontSize,filename) - if filename then - self.Font = love.graphics.newFont(filename, tonumber(FontSize)) - else - self.Font=love.graphics.setNewFont(tonumber(FontSize)) - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/setParent.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/setParent.int deleted file mode 100644 index 37ddb6e..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/setParent.int +++ /dev/null @@ -1,14 +0,0 @@ -function gui:setParent(parent,name)-- Needs fixing!!! - local temp=self.Parent:getChildren() - for i=1,#temp do - if temp[i]==self then - table.remove(self.Parent.Children,i) - break - end - end - table.insert(parent.Children,self) - self.Parent=parent - if name then - self:SetName(name) - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/setVisibility.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/setVisibility.int deleted file mode 100644 index ca6008c..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/setVisibility.int +++ /dev/null @@ -1,14 +0,0 @@ -function gui:setVisiblity(val) - self.Visible=val - self.oV=val - doto=self:GetAllChildren() - if val==false then - for i=1,#doto do - doto[i].Visible=val - end - else - for i=1,#doto do - doto[i].Visible=doto[i].oV - end - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Misc/setgetText.int b/examples/love2d Threading Example/GuiManagerDebug/Misc/setgetText.int deleted file mode 100644 index bb4afc6..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Misc/setgetText.int +++ /dev/null @@ -1,6 +0,0 @@ -function gui:setText(txt) - self.text=txt -end -function gui:getText(txt) - return self.text -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Text/newTextBox.int b/examples/love2d Threading Example/GuiManagerDebug/Text/newTextBox.int deleted file mode 100644 index 69e2683..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Text/newTextBox.int +++ /dev/null @@ -1,181 +0,0 @@ -function string:insert(p,s) - return ("%s%s%s"):format(self:sub(1,p), s, self:sub(p+1)) -end -function string:remove(p,l) - l=l or 1 - return ("%s%s"):format(self:sub(1,p-1), self:sub(p+l)) -end -function gui:newTextBox(t,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("TextBox",name, x, y, w, h, sx ,sy ,sw ,sh) - c.ClearOnFocus=false - c.LoseFocusOnEnter=true - c.Tween=0 - c.XTween=0 - c.FontHeight=_defaultfont:getHeight() - c.Font=_defaultfont - c.FontSize=15 - c.TextFormat="center" - c.text = t - c.ttext= t - c.AutoScaleText=false - c.TextVisibility=1 - c.Color = {220, 220, 220} - c.TextColor = {0, 0, 0} - c.Active=false - c.hidden=false - c.cursor={0,1} - c.mark=nil - c.arrowkeys=false - c.funcF={function() - love.keyboard.setTextInput(true,0,200,400,200) - end} - c.cooldown=false - c.cooldown2=false - c.funcE={function() - love.keyboard.setTextInput(false) - end} - function c:triggerEnter() - for cc=1,#self.funcE do - self.funcE[cc](self,self.ttext) - end - self.text="" - self.ttext="" - end - c.Enter=true - c.Alarm=multi:newAlarm(.1) - c.Alarm.parent=c - c.Alarm:OnRing(function(alarm) alarm.parent.cooldown=false end) - c.Alarm2=multi:newAlarm(.5) - c.Alarm2.parent=c - c.Alarm2:OnRing(function(alarm) alarm.parent.cooldown2=false end) - c.ArrowAlarm=multi:newAlarm(.1) - c.ArrowAlarm.parent=c - c.ArrowAlarm:OnRing(function(alarm) alarm.parent.arrowkeys=false end) - function c:OnFocus(func) - table.insert(self.funcF,func) - end - function c:OnEnter(func) - table.insert(self.funcE,func) - end - c:OnClicked(function(b,self) - self:focus() - end) - function c:focus() - for cc=1,#self.funcF do - self.funcF[cc](self) - end - if self.Active==false then - if self.ClearOnFocus==true then - self.text="" - self.ttext="" - end - for tb=1,#gui.TB do - if gui.TB[tb]~=nil then - gui.TB[tb].Active=false - end - end - self.Active=true - end - end - c:OnClicked(function(b,self,x,y) - local dwidth, wrappedtext = _defaultfont:getWrap(self.text:sub(1,self.cursor[1]), self.width) - local height = _defaultfont:getHeight() - if #wrappedtext>=1 then - width= _defaultfont:getWidth(wrappedtext[#wrappedtext]) - self.cursor[2]=#wrappedtext - else - self.cursor[2]=1 - width=0 - end - yc=math.ceil(((y/self.DPI)-(self.FontHeight/2)+self.Tween-self.y)/height) - xc=math.floor(x) - end) - c:AddDrawRuleE(function(self) - if self.Active then - local dwidth, wrappedtext = _defaultfont:getWrap(self.text:sub(1,self.cursor[1]), self.width) - local height = _defaultfont:getHeight() - if #wrappedtext>=1 then - width= _defaultfont:getWidth(wrappedtext[#wrappedtext]) - self.cursor[2]=#wrappedtext - else - self.cursor[2]=1 - width=0 - end - x1=width+2+self.x+self.XTween - y1=(self.y+(height*(self.cursor[2]-1))+(self.FontHeight/2)+self.Tween)*self.DPI - x2=width+2+self.x+self.XTween - y2=(self.y+(self.FontHeight/2)+self.Tween*self.DPI)+height*self.cursor[2] - love.graphics.line(x1,y1,x2,y2) - end - end) - c:OnUpdate(function(self) - if love.keyboard.isDown("backspace") and self.Active and self.cooldown==false then - if #self.text>0 then - self.text = self.text:remove(self.cursor[1]) - self.ttext = self.ttext:remove(self.cursor[1]) - self.cursor[1]=self.cursor[1]-1 - end - self.cooldown=true - self.Alarm:Reset() - elseif love.keyboard.isDown("backspace")==false then - self.cooldown=false - end - if love.keyboard.isDown("left") and self.arrowkeys==false and self.Active then - self.arrowkeys=true - self.cursor[1]=self.cursor[1]-1 - if self.cursor[1]<0 then - self.cursor[1]=0 - end - self.ArrowAlarm:Reset() - elseif love.keyboard.isDown("right") and self.arrowkeys==false and self.Active then - self.arrowkeys=true - self.cursor[1]=self.cursor[1]+1 - if self.cursor[1]>#self.text then - self.cursor[1]=#self.text - end - self.ArrowAlarm:Reset() - end - if love.keyboard.isDown("delete") and self.Active then - if #self.text>0 then - self.text = "" - self.ttext = "" - self.cursor[1]=1 - end - elseif (love.keyboard.isDown("lshift") or love.keyboard.isDown("rshift")) and love.keyboard.isDown("return") and self.cooldown2==false then - self.text=self.text.."\n" - self.ttext=self.ttext.."\n" - self.cooldown2=true - c.Alarm2:Reset() - elseif (love.keyboard.isDown("return") or love.keyboard.isDown("kpenter")) and self.Active and self.Enter and not(love.keyboard.isDown("lshift") or love.keyboard.isDown("rshift")) then - if self.LoseFocusOnEnter then - self.Active=false - else - self.Active=true - end - for cc=1,#self.funcE do - self.funcE[cc](self,self.ttext) - end - end - end) - table.insert(gui.TB,c) - return c -end ---TEXT BOX HELPER FUNCTION -function love.textinput(t) - for tb=1,#gui.TB do - if gui.TB[tb]~=nil then - if gui.TB[tb].Active then - if gui.TB[tb].hidden then - --gui.TB[tb].text=gui.TB[tb].text.."*" - gui.TB[tb].text=gui.TB[tb].text:insert(gui.TB[tb].cursor[1],"*") - else - --gui.TB[tb].text=gui.TB[tb].text..t - gui.TB[tb].text=gui.TB[tb].text:insert(gui.TB[tb].cursor[1],t) - end - gui.TB[tb].ttext=gui.TB[tb].ttext:insert(gui.TB[tb].cursor[1],t) - gui.TB[tb].cursor[1]=gui.TB[tb].cursor[1]+1 - end - end - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Text/newTextButton.int b/examples/love2d Threading Example/GuiManagerDebug/Text/newTextButton.int deleted file mode 100644 index da2f3f6..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Text/newTextButton.int +++ /dev/null @@ -1,22 +0,0 @@ -function gui:newTextButton(t,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("TextButton",name, x, y, w, h, sx ,sy ,sw ,sh) - c.Tween=0 - c.XTween=0 - c.FontHeight=_defaultfont:getHeight() - c.Font=_defaultfont - c.FontSize=15 - c.TextFormat="center" - c.text = t - c.AutoScaleText=false - c.TextVisibility=1 -- 0=invisible,1=solid (self.TextVisibility*254+1) - c.Color = {220, 220, 220} - c.TextColor = {0, 0, 0} - c:OnEnter(function() - love.mouse.setCursor(_GuiPro.CursorH) - end) - c:OnExit(function() - love.mouse.setCursor(_GuiPro.CursorN) - end) - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Text/newTextLabel.int b/examples/love2d Threading Example/GuiManagerDebug/Text/newTextLabel.int deleted file mode 100644 index 4424d0e..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Text/newTextLabel.int +++ /dev/null @@ -1,16 +0,0 @@ -function gui:newTextLabel(t,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("TextLabel",name, x, y, w, h, sx ,sy ,sw ,sh) - c.Tween=0 - c.XTween=0 - c.FontHeight=_defaultfont:getHeight() - c.Font=_defaultfont - c.FontSize=15 - c.TextFormat="center" - c.text = t - c.AutoScaleText=false - c.TextVisibility=1 -- 0=invisible,1=solid (self.TextVisibility*254+1) - c.Color = {220, 220, 220} - c.TextColor = {0, 0, 0} - return c -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/Text/widthToFontSize.int b/examples/love2d Threading Example/GuiManagerDebug/Text/widthToFontSize.int deleted file mode 100644 index a36b6dc..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/Text/widthToFontSize.int +++ /dev/null @@ -1,5 +0,0 @@ -function gui:widthToTextSize(n) - if self.Font then - self:setDualDim(nil,nil,self.Font:getWidth(self.text)+(n or 4),nil,nil,nil,0) - end -end \ No newline at end of file diff --git a/examples/love2d Threading Example/GuiManagerDebug/init.lua b/examples/love2d Threading Example/GuiManagerDebug/init.lua deleted file mode 100644 index 2eba1e6..0000000 --- a/examples/love2d Threading Example/GuiManagerDebug/init.lua +++ /dev/null @@ -1,55 +0,0 @@ -utf8 = require("utf8") -gui = {} -gui.__index = gui -gui.TB={} -gui.Version="VERSION" -- Is it really ready for release? -_GuiPro={GBoost=true,hasDrag=false,DragItem={},Children={},Visible=true,count=0,x=0,y=0,height=0,width=0,update=function(self) local things=GetAllChildren2(self) UpdateThings(things) end,draw=function(self) local things=GetAllChildren(self) DrawThings(things) end,getChildren=function(self) return self.Children end} -_GuiPro.Clips={} -_GuiPro.rotate=0 -_defaultfont = love.graphics.setNewFont(12) -setmetatable(_GuiPro, gui) -function gui:LoadInterface(file) - local add=".int" - if string.find(file,".",1,true) then add="" end - if love.filesystem.getInfo(file..add) then - a,b=pcall(love.filesystem.load(file..add)) - if a then - --print("Loaded: "..file) - else - print("Error loading file: "..file) - print(a,b) - end - else - print("File does not exist!") - return false - end -end -function gui.LoadAll(dir) - files=love.filesystem.getDirectoryItems(dir) - for i=1,#files do - if string.sub(files[i],-4)==".int" then - gui:LoadInterface(dir.."/"..files[i]) - end - end -end --- Start Of Load - -gui.LoadAll("GuiManager/Core") -gui.LoadAll("GuiManager/Image-Animation") -gui.LoadAll("GuiManager/Frame") -gui.LoadAll("GuiManager/Item") -gui.LoadAll("GuiManager/Misc") -gui.LoadAll("GuiManager/Text") -gui.LoadAll("GuiManager/Drawing") - -multi.boost=2 --- End of Load -gui:respectHierarchy() -_GuiPro.width,_GuiPro.height=love.graphics.getDimensions() -multi:newLoop():OnLoop(function() _GuiPro.width,_GuiPro.height=love.graphics.getDimensions() _GuiPro:update() end) -multi:onDraw(function() _GuiPro:draw() end) -gui.ff=gui:newFrame("",0,0,0,0,0,0,1,1) -gui.ff.Color={255,255,255} -gui.ff:OnUpdate(function(self) - self:BottomStack() -end) diff --git a/examples/love2d Threading Example/Menus/newselectMenu.int b/examples/love2d Threading Example/Menus/newselectMenu.int deleted file mode 100644 index e69de29..0000000 diff --git a/examples/love2d Threading Example/Res/Parallax100.png b/examples/love2d Threading Example/Res/Parallax100.png deleted file mode 100644 index b4b79bc..0000000 Binary files a/examples/love2d Threading Example/Res/Parallax100.png and /dev/null differ diff --git a/examples/love2d Threading Example/Res/Parallax60.png b/examples/love2d Threading Example/Res/Parallax60.png deleted file mode 100644 index d6c501a..0000000 Binary files a/examples/love2d Threading Example/Res/Parallax60.png and /dev/null differ diff --git a/examples/love2d Threading Example/Res/Parallax80.png b/examples/love2d Threading Example/Res/Parallax80.png deleted file mode 100644 index a7fbb25..0000000 Binary files a/examples/love2d Threading Example/Res/Parallax80.png and /dev/null differ diff --git a/examples/love2d Threading Example/Res/ship.png b/examples/love2d Threading Example/Res/ship.png deleted file mode 100644 index 242ca2b..0000000 Binary files a/examples/love2d Threading Example/Res/ship.png and /dev/null differ diff --git a/examples/love2d Threading Example/bin/compressors/lzw.lua b/examples/love2d Threading Example/bin/compressors/lzw.lua deleted file mode 100644 index 57653b3..0000000 --- a/examples/love2d Threading Example/bin/compressors/lzw.lua +++ /dev/null @@ -1,73 +0,0 @@ ---[[ -LZW String Compression demo for Gideros -This code is MIT licensed, see http://www.opensource.org/licenses/mit-license.php -(C) 2013 - Guava7 -]] -CLZWCompression = {} -function CLZWCompression:InitDictionary(isEncode) - self.mDictionary = {} - -- local s = " !#$%&'\"()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" - local s={} - for i=1,255 do - s[#s+1]=string.char(i) - end - s=table.concat(s) - local len = #s - for i = 1, len do - if isEncode then - self.mDictionary[s:sub(i, i)] = i - else - self.mDictionary[i] = s:sub(i, i) - end - end - self.mDictionaryLen = len -end -function CLZWCompression:Encode(sInput) - self:InitDictionary(true) - local s = "" - local ch - local len = #sInput - local result = {} - local dic = self.mDictionary - local temp - for i = 1, len do - ch = sInput:sub(i, i) - temp = s..ch - if dic[temp] then - s = temp - else - result[#result + 1] = dic[s] - self.mDictionaryLen = self.mDictionaryLen + 1 - dic[temp] = self.mDictionaryLen - s = ch - end - end - result[#result + 1] = dic[s] - return result -end -function CLZWCompression:Decode(data) - self:InitDictionary(false) - local dic = self.mDictionary - local entry - local ch - local prevCode, currCode - local result = {} - prevCode = data[1] - result[#result + 1] = dic[prevCode] - for i = 2, #data do - currCode = data[i] - entry = dic[currCode] - if entry then - ch = entry:sub(1, 1) - result[#result + 1] = entry - else - ch = dic[prevCode]:sub(1, 1) - result[#result + 1] = dic[prevCode]..ch - end - dic[#dic + 1] = dic[prevCode]..ch - prevCode = currCode - end - return table.concat(result) -end - -return CLZWCompression diff --git a/examples/love2d Threading Example/bin/converters/base64.lua b/examples/love2d Threading Example/bin/converters/base64.lua deleted file mode 100644 index 6b134c3..0000000 --- a/examples/love2d Threading Example/bin/converters/base64.lua +++ /dev/null @@ -1,30 +0,0 @@ -local base64={} -local bs = { [0] = - 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P', - 'Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e','f', - 'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v', - 'w','x','y','z','0','1','2','3','4','5','6','7','8','9','+','/', -} -local bsd=table.flip(bs) -local char=string.char -function base64.encode(s) - local byte, rep, pad = string.byte, string.rep, 2 - ((#s-1) % 3) - s = (s..rep('\0', pad)):gsub("...", function(cs) - local a, b, c = byte(cs, 1, 3) - return bs[bit.rshift(a,2)] .. bs[bit.bor(bit.lshift(bit.band(a,3),4),bit.rshift(b,4))] .. bs[bit.bor(bit.lshift(bit.band(b,15),2),bit.rshift(c,6))] .. bs[bit.band(c,63)] - end) - return s:sub(1, #s-pad) .. rep('=', pad) -end -function base64.decode(s) - local s=s:match("["..s.."=]+") - local p,cc=s:gsub("=","A") - local r="" - local n=0 - s=s:sub(1,#s-#p)..p - for c = 1,#s,4 do - n = bit.lshift(bsd[s:sub(c, c)], 18) + bit.lshift(bsd[s:sub(c+1, c+1)], 12) + bit.lshift(bsd[s:sub(c + 2, c + 2)], 6) + bsd[s:sub(c + 3, c + 3)] - r = r .. char(bit.band(bit.arshift(n, 16), 0xFF)) .. char(bit.band(bit.arshift(n, 8), 0xFF)) .. char(bit.band(n, 0xFF)) - end - return r:sub(1,-(cc+1)) -end -return base64 diff --git a/examples/love2d Threading Example/bin/converters/base91.lua b/examples/love2d Threading Example/bin/converters/base91.lua deleted file mode 100644 index 157f312..0000000 --- a/examples/love2d Threading Example/bin/converters/base91.lua +++ /dev/null @@ -1,72 +0,0 @@ -local base91={} -local b91enc={[0]= - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', - 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', - 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '!', '#', '$', - '%', '&', '(', ')', '*', '+', ',', '.', '/', ':', ';', '<', '=', - '>', '?', '@', '[', ']', '^', '_', '`', '{', '|', '}', '~', '"' -} -local b91dec=table.flip(b91enc) -function base91.decode(d) - local l,v,o,b,n = #d,-1,"",0,0 - for i in d:gmatch(".") do - local c=b91dec[i] - if not(c) then - -- Continue - else - if v < 0 then - v = c - else - v = v+c*91 - b = bit.bor(b, bit.lshift(v,n)) - if bit.band(v,8191) then - n = n + 13 - else - n = n + 14 - end - while true do - o=o..string.char(bit.band(b,255)) - b=bit.rshift(b,8) - n=n-8 - if not (n>7) then - break - end - end - v=-1 - end - end - end - if v + 1>0 then - o=o..string.char(bit.band(bit.bor(b,bit.lshift(v,n)),255)) - end - return o -end -function base91.encode(d) - local b,n,o,l=0,0,"",#d - for i in d:gmatch(".") do - b=bit.bor(b,bit.lshift(string.byte(i),n)) - n=n+8 - if n>13 then - v=bit.band(b,8191) - if v>88 then - b=bit.rshift(b,13) - n=n-13 - else - v=bit.band(b,16383) - b=bit.rshift(b,14) - n=n-14 - end - o=o..b91enc[v % 91] .. b91enc[math.floor(v / 91)] - end - end - if n>0 then - o=o..b91enc[b % 91] - if n>7 or b>90 then - o=o .. b91enc[math.floor(b / 91)] - end - end - return o -end -return base91 diff --git a/examples/love2d Threading Example/bin/hashes/md5.lua b/examples/love2d Threading Example/bin/hashes/md5.lua deleted file mode 100644 index 7ffa55a..0000000 --- a/examples/love2d Threading Example/bin/hashes/md5.lua +++ /dev/null @@ -1,377 +0,0 @@ -local md5 = { - _VERSION = "md5.lua 1.1.0", - _DESCRIPTION = "MD5 computation in Lua (5.1-3, LuaJIT)", - _URL = "https://github.com/kikito/md5.lua", - _LICENSE = [[ - MIT LICENSE - - Copyright (c) 2013 Enrique García Cota + Adam Baldwin + hanzao + Equi 4 Software - ]] -} - --- bit lib implementions - -local char, byte, format, rep, sub = - string.char, string.byte, string.format, string.rep, string.sub -local bit_or, bit_and, bit_not, bit_xor, bit_rshift, bit_lshift - -local ok, bit = pcall(require, 'bit') -if ok then - bit_or, bit_and, bit_not, bit_xor, bit_rshift, bit_lshift = bit.bor, bit.band, bit.bnot, bit.bxor, bit.rshift, bit.lshift -else - ok, bit = pcall(require, 'bit32') - - if ok then - - bit_not = bit.bnot - - local tobit = function(n) - return n <= 0x7fffffff and n or -(bit_not(n) + 1) - end - - local normalize = function(f) - return function(a,b) return tobit(f(tobit(a), tobit(b))) end - end - - bit_or, bit_and, bit_xor = normalize(bit.bor), normalize(bit.band), normalize(bit.bxor) - bit_rshift, bit_lshift = normalize(bit.rshift), normalize(bit.lshift) - - else - - local function tbl2number(tbl) - local result = 0 - local power = 1 - for i = 1, #tbl do - result = result + tbl[i] * power - power = power * 2 - end - return result - end - - local function expand(t1, t2) - local big, small = t1, t2 - if(#big < #small) then - big, small = small, big - end - -- expand small - for i = #small + 1, #big do - small[i] = 0 - end - end - - local to_bits -- needs to be declared before bit_not - - bit_not = function(n) - local tbl = to_bits(n) - local size = math.max(#tbl, 32) - for i = 1, size do - if(tbl[i] == 1) then - tbl[i] = 0 - else - tbl[i] = 1 - end - end - return tbl2number(tbl) - end - - -- defined as local above - to_bits = function (n) - if(n < 0) then - -- negative - return to_bits(bit_not(math.abs(n)) + 1) - end - -- to bits table - local tbl = {} - local cnt = 1 - local last - while n > 0 do - last = n % 2 - tbl[cnt] = last - n = (n-last)/2 - cnt = cnt + 1 - end - - return tbl - end - - bit_or = function(m, n) - local tbl_m = to_bits(m) - local tbl_n = to_bits(n) - expand(tbl_m, tbl_n) - - local tbl = {} - for i = 1, #tbl_m do - if(tbl_m[i]== 0 and tbl_n[i] == 0) then - tbl[i] = 0 - else - tbl[i] = 1 - end - end - - return tbl2number(tbl) - end - - bit_and = function(m, n) - local tbl_m = to_bits(m) - local tbl_n = to_bits(n) - expand(tbl_m, tbl_n) - - local tbl = {} - for i = 1, #tbl_m do - if(tbl_m[i]== 0 or tbl_n[i] == 0) then - tbl[i] = 0 - else - tbl[i] = 1 - end - end - - return tbl2number(tbl) - end - - bit_xor = function(m, n) - local tbl_m = to_bits(m) - local tbl_n = to_bits(n) - expand(tbl_m, tbl_n) - - local tbl = {} - for i = 1, #tbl_m do - if(tbl_m[i] ~= tbl_n[i]) then - tbl[i] = 1 - else - tbl[i] = 0 - end - end - - return tbl2number(tbl) - end - - bit_rshift = function(n, bits) - local high_bit = 0 - if(n < 0) then - -- negative - n = bit_not(math.abs(n)) + 1 - high_bit = 0x80000000 - end - - local floor = math.floor - - for i=1, bits do - n = n/2 - n = bit_or(floor(n), high_bit) - end - return floor(n) - end - - bit_lshift = function(n, bits) - if(n < 0) then - -- negative - n = bit_not(math.abs(n)) + 1 - end - - for i=1, bits do - n = n*2 - end - return bit_and(n, 0xFFFFFFFF) - end - end -end - --- convert little-endian 32-bit int to a 4-char string -local function lei2str(i) - local f=function (s) return char( bit_and( bit_rshift(i, s), 255)) end - return f(0)..f(8)..f(16)..f(24) -end - --- convert raw string to big-endian int -local function str2bei(s) - local v=0 - for i=1, #s do - v = v * 256 + byte(s, i) - end - return v -end - --- convert raw string to little-endian int -local function str2lei(s) - local v=0 - for i = #s,1,-1 do - v = v*256 + byte(s, i) - end - return v -end - --- cut up a string in little-endian ints of given size -local function cut_le_str(s,...) - local o, r = 1, {} - local args = {...} - for i=1, #args do - table.insert(r, str2lei(sub(s, o, o + args[i] - 1))) - o = o + args[i] - end - return r -end - -local swap = function (w) return str2bei(lei2str(w)) end - --- An MD5 mplementation in Lua, requires bitlib (hacked to use LuaBit from above, ugh) --- 10/02/2001 jcw@equi4.com - -local CONSTS = { - 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, - 0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501, - 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, - 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, - 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, - 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8, - 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, - 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, - 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c, - 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, - 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05, - 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665, - 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, - 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1, - 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, - 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391, - 0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476 -} - -local f=function (x,y,z) return bit_or(bit_and(x,y),bit_and(-x-1,z)) end -local g=function (x,y,z) return bit_or(bit_and(x,z),bit_and(y,-z-1)) end -local h=function (x,y,z) return bit_xor(x,bit_xor(y,z)) end -local i=function (x,y,z) return bit_xor(y,bit_or(x,-z-1)) end -local z=function (ff,a,b,c,d,x,s,ac) - a=bit_and(a+ff(b,c,d)+x+ac,0xFFFFFFFF) - -- be *very* careful that left shift does not cause rounding! - return bit_or(bit_lshift(bit_and(a,bit_rshift(0xFFFFFFFF,s)),s),bit_rshift(a,32-s))+b -end - -local function transform(A,B,C,D,X) - local a,b,c,d=A,B,C,D - local t=CONSTS - - a=z(f,a,b,c,d,X[ 0], 7,t[ 1]) - d=z(f,d,a,b,c,X[ 1],12,t[ 2]) - c=z(f,c,d,a,b,X[ 2],17,t[ 3]) - b=z(f,b,c,d,a,X[ 3],22,t[ 4]) - a=z(f,a,b,c,d,X[ 4], 7,t[ 5]) - d=z(f,d,a,b,c,X[ 5],12,t[ 6]) - c=z(f,c,d,a,b,X[ 6],17,t[ 7]) - b=z(f,b,c,d,a,X[ 7],22,t[ 8]) - a=z(f,a,b,c,d,X[ 8], 7,t[ 9]) - d=z(f,d,a,b,c,X[ 9],12,t[10]) - c=z(f,c,d,a,b,X[10],17,t[11]) - b=z(f,b,c,d,a,X[11],22,t[12]) - a=z(f,a,b,c,d,X[12], 7,t[13]) - d=z(f,d,a,b,c,X[13],12,t[14]) - c=z(f,c,d,a,b,X[14],17,t[15]) - b=z(f,b,c,d,a,X[15],22,t[16]) - - a=z(g,a,b,c,d,X[ 1], 5,t[17]) - d=z(g,d,a,b,c,X[ 6], 9,t[18]) - c=z(g,c,d,a,b,X[11],14,t[19]) - b=z(g,b,c,d,a,X[ 0],20,t[20]) - a=z(g,a,b,c,d,X[ 5], 5,t[21]) - d=z(g,d,a,b,c,X[10], 9,t[22]) - c=z(g,c,d,a,b,X[15],14,t[23]) - b=z(g,b,c,d,a,X[ 4],20,t[24]) - a=z(g,a,b,c,d,X[ 9], 5,t[25]) - d=z(g,d,a,b,c,X[14], 9,t[26]) - c=z(g,c,d,a,b,X[ 3],14,t[27]) - b=z(g,b,c,d,a,X[ 8],20,t[28]) - a=z(g,a,b,c,d,X[13], 5,t[29]) - d=z(g,d,a,b,c,X[ 2], 9,t[30]) - c=z(g,c,d,a,b,X[ 7],14,t[31]) - b=z(g,b,c,d,a,X[12],20,t[32]) - - a=z(h,a,b,c,d,X[ 5], 4,t[33]) - d=z(h,d,a,b,c,X[ 8],11,t[34]) - c=z(h,c,d,a,b,X[11],16,t[35]) - b=z(h,b,c,d,a,X[14],23,t[36]) - a=z(h,a,b,c,d,X[ 1], 4,t[37]) - d=z(h,d,a,b,c,X[ 4],11,t[38]) - c=z(h,c,d,a,b,X[ 7],16,t[39]) - b=z(h,b,c,d,a,X[10],23,t[40]) - a=z(h,a,b,c,d,X[13], 4,t[41]) - d=z(h,d,a,b,c,X[ 0],11,t[42]) - c=z(h,c,d,a,b,X[ 3],16,t[43]) - b=z(h,b,c,d,a,X[ 6],23,t[44]) - a=z(h,a,b,c,d,X[ 9], 4,t[45]) - d=z(h,d,a,b,c,X[12],11,t[46]) - c=z(h,c,d,a,b,X[15],16,t[47]) - b=z(h,b,c,d,a,X[ 2],23,t[48]) - - a=z(i,a,b,c,d,X[ 0], 6,t[49]) - d=z(i,d,a,b,c,X[ 7],10,t[50]) - c=z(i,c,d,a,b,X[14],15,t[51]) - b=z(i,b,c,d,a,X[ 5],21,t[52]) - a=z(i,a,b,c,d,X[12], 6,t[53]) - d=z(i,d,a,b,c,X[ 3],10,t[54]) - c=z(i,c,d,a,b,X[10],15,t[55]) - b=z(i,b,c,d,a,X[ 1],21,t[56]) - a=z(i,a,b,c,d,X[ 8], 6,t[57]) - d=z(i,d,a,b,c,X[15],10,t[58]) - c=z(i,c,d,a,b,X[ 6],15,t[59]) - b=z(i,b,c,d,a,X[13],21,t[60]) - a=z(i,a,b,c,d,X[ 4], 6,t[61]) - d=z(i,d,a,b,c,X[11],10,t[62]) - c=z(i,c,d,a,b,X[ 2],15,t[63]) - b=z(i,b,c,d,a,X[ 9],21,t[64]) - - return bit_and(A+a,0xFFFFFFFF),bit_and(B+b,0xFFFFFFFF), - bit_and(C+c,0xFFFFFFFF),bit_and(D+d,0xFFFFFFFF) -end - ----------------------------------------------------------------- - -local function md5_update(self, s) - self.pos = self.pos + #s - s = self.buf .. s - for ii = 1, #s - 63, 64 do - local X = cut_le_str(sub(s,ii,ii+63),4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4) - assert(#X == 16) - X[0] = table.remove(X,1) -- zero based! - self.a,self.b,self.c,self.d = transform(self.a,self.b,self.c,self.d,X) - end - self.buf = sub(s, math.floor(#s/64)*64 + 1, #s) - return self -end - -local function md5_finish(self) - local msgLen = self.pos - local padLen = 56 - msgLen % 64 - - if msgLen % 64 > 56 then padLen = padLen + 64 end - - if padLen == 0 then padLen = 64 end - - local s = char(128) .. rep(char(0),padLen-1) .. lei2str(bit_and(8*msgLen, 0xFFFFFFFF)) .. lei2str(math.floor(msgLen/0x20000000)) - md5_update(self, s) - - assert(self.pos % 64 == 0) - return lei2str(self.a) .. lei2str(self.b) .. lei2str(self.c) .. lei2str(self.d) -end - ----------------------------------------------------------------- - -function md5.new() - return { a = CONSTS[65], b = CONSTS[66], c = CONSTS[67], d = CONSTS[68], - pos = 0, - buf = '', - update = md5_update, - finish = md5_finish } -end - -function md5.tohex(s) - return format("%08x%08x%08x%08x", str2bei(sub(s, 1, 4)), str2bei(sub(s, 5, 8)), str2bei(sub(s, 9, 12)), str2bei(sub(s, 13, 16))) -end - -function md5.sum(s) - return md5.new():update(s):finish() -end - -function md5.sumhexa(s) - return md5.tohex(md5.sum(s)) -end - -return md5 diff --git a/examples/love2d Threading Example/bin/init.lua b/examples/love2d Threading Example/bin/init.lua deleted file mode 100644 index 3728c6f..0000000 --- a/examples/love2d Threading Example/bin/init.lua +++ /dev/null @@ -1,739 +0,0 @@ -bin={} -bin.Version={5,1,0} -bin.stage='stable' -bin.data='' -bin.t='bin' -bin.__index = bin -bin.__tostring=function(self) return self:getData() end -bin.__len=function(self) return self:getlength() end -bin.lastBlockSize=0 -bin.streams={} --- Helpers -function bin.getVersion() - return bin.Version[1]..'.'..bin.Version[2]..'.'..bin.Version[3] -end -require("bin.support.utils") -if jit then - bit=require("bit") -elseif bit32 then - bit=bit32 -else - bit=require("bin.numbers.no_jit_bit") -end -base64=require("bin.converters.base64") -base91=require("bin.converters.base91") -bin.lzw=require("bin.compressors.lzw") -- A WIP -bits=require("bin.numbers.bits") -infinabits=require("bin.numbers.infinabits") -- like the bits library but works past 32 bits for 32bit lua and 64 bits for 64 bit lua. -bin.md5=require("bin.hashes.md5") -randomGen=require("bin.numbers.random") -function bin.setBitsInterface(int) - bin.defualtBit=int or bits -end -bin.setBitsInterface() -function bin.normalizeData(data) -- unified function to allow for all types to string - if type(data)=="string" then return data end - if type(data)=="table" then - if data.Type=="bin" or data.Type=="streamable" or data.Type=="buffer" then - return data:getData() - elseif data.Type=="bits" or data.Type=="infinabits" then - return data:toSbytes() - elseif data.Type=="sink" then - -- LATER - else - return "" - end - elseif type(data)=="userdata" then - if tostring(data):sub(1,4)=="file" then - local cur=data:seek("cur") - data:seek("set",0) - local dat=data:read("*a") - data:seek("set",cur) - return dat - else - error("File handles are the only userdata that can be used!") - end - end -end -function bin.resolveType(tab) -- used in getblock for auto object creation. Internal method - if tab.Type then - if tab.Type=="bin" then - return bin.new(tab.data) - elseif tab.Type=="streamable" then - if bin.fileExist(tab.file) then return nil,"Cannot load the stream file, source file does not exist!" end - return bin.stream(tab.file,tab.lock) - elseif tab.Type=="buffer" then - local buf=bin.newDataBuffer(tab.size) - buf[1]=tab:getData() - return buf - elseif tab.Type=="bits" then - local b=bits.new("") - b.data=tab.data - return b - elseif tab.Type=="infinabits" then - local b=infinabits.new("") - b.data=tab.data - return b - elseif tab.Type=="sink" then - return bin.newSync(tab.data) - else -- maybe a type from another library - return tab - end - else return tab end -end -function bin.fileExist(path) - g=io.open(path or '','r') - if path =='' then - p='empty path' - return nil - end - if g~=nil and true or false then - p=(g~=nil and true or false) - end - if g~=nil then - io.close(g) - else - return false - end - return p -end -function bin.toHex(str) - local str=bin.normalizeData(str) - return (str:gsub('.', function (c) - return string.format('%02X', string.byte(c)) - end)) -end -function bin.fromHex(str) - return (str:gsub('..', function (cc) - return string.char(tonumber(cc, 16)) - end)) -end -function bin.toBase64(s) - return base64.encode(s) -end -function bin.fromBase64(s) - return base64.decode(s) -end -function bin.toBase91(s) - return base91.encode(s) -end -function bin.fromBase91(s) - return base91.decode(s) -end --- Constructors -function bin.new(data) - data=bin.normalizeData(data) - local c = {} - setmetatable(c, bin) - c.data=data - c.Type="bin" - c.t="bin" - c.pos=1 - c.stream=false - return c -end -function bin.newFromBase64(data) - return bin.new(bin.fromBase64(data)) -end -function bin.newFromBase91(data) - return bin.new(bin.fromBase91(data)) -end -function bin.newFromHex(data) - return bin.new(bin.fromHex(data)) -end -function bin.load(path) - if type(path) ~= "string" then error("Path must be a string!") end - local f = io.open(path, 'rb') - local content = f:read('*a') - f:close() - return bin.new(content) -end -function bin.stream(file,l) - if not(l==false) then l=true end - local c=bin.new() - c.Type="streamable" - c.t="streamable" - if bin.streams[file]~=nil then - c.file=file - c.lock = l - c.workingfile=bin.streams[file][1].workingfile - bin.streams[file][2]=bin.streams[file][2]+1 - c.stream=true - return c - end - if bin.fileExist(file) then - c.file=file - c.lock = l - c.workingfile=io.open(file,'rb+') - else - c.file=file - c.lock = l - c.workingfile=io.open(file,'w') - io.close(c.workingfile) - c.workingfile=io.open(file,'rb+') - end - c.stream=true - bin.streams[file]={c,1} - return c -end -function bin.newTempFile() - local c=bin.new() - c.file=file - c.lock = false - c.workingfile=io.tmpfile() - c.stream=true - return c -end -function bin.freshStream(file) - bin.new():tofile(file) - return bin.stream(file,false) -end -function bin.newStreamFileObject(file) - local c=bin.new() - c.Type="streamable" - c.t="streamable" - c.file="FILE_OBJECT" - c.lock = false - c.workingfile=file - c.stream=true - return c -end --- Core Methods -function bin:canStreamWrite() - return (self.stream and not(self.lock)) -end -function bin:getSeek() - if self.stream then - return self.workingfile:seek("cur")+1 - else - return self.pos - end -end -function bin:setSeek(n) - if self.stream then - self.workingfile:seek("set",n-1) - else - self.pos=n - end -end -function bin:seek(n) - if self.stream then - if not n then return self.workingfile:seek("cur") end - local cur=self.workingfile:seek("cur") - self.workingfile:seek("set",cur+n) - else - if not n then return self.pos end - if #self.data-(self.pos-1)size then - data = data:sub(1,size) - elseif dsize255 then - nn=nn%256 - elseif nn<0 then - nn=256-math.abs(nn) - end - buf[i]=nn - end - self:setSeek(1) - self:write(buf:getData()) -end -function bin:getData(a,b,fmt) - local data="" - if a or b then - data=self:sub(a,b) - else - if self.stream then - local cur=self.workingfile:seek("cur") - self.workingfile:seek("set",0) - data=self.workingfile:read("*a") - self.workingfile:seek("set",cur) - else - data=self.data - end - end - if fmt=="%x" or fmt=="hex" then - return bin.toHex(data):lower() - elseif fmt=="%X" or fmt=="HEX" then - return bin.toHex(data) - elseif fmt=="%b" or fmt=="b64" then - return bin.toB64(data) - elseif fmt then - return bin.new(data):getBlock(fmt,#data) - end - return data -end -function bin:getSize(fmt) - local len=0 - if self.stream then - local cur=self.workingfile:seek("cur") - len=self.workingfile:seek("end") - self.workingfile:seek("set",cur) - else - len=#self.data - end - if fmt=="%b" then - return bin.toB64() - elseif fmt then - return string.format(fmt, len) - else - return len - end -end -function bin:tackE(data,size,h) - local data=bin.normalizeData(data) - local cur=self:getSize() - self:setSeek(self:getSize()+1) - self:write(data,size) - if h then - self:setSeek(cur+1) - end -end -function bin:tonumber(a,b) - local temp={} - if a then - temp.data=self:sub(a,b) - else - temp=self - end - local l,r=0,0 - local g=#temp.data - for i=1,g do - r=r+(256^(g-i))*string.byte(string.sub(temp.data,i,i)) - l=l+(256^(i-1))*string.byte(string.sub(temp.data,i,i)) - end - return r,l -end -function bin.endianflop(data) - return string.reverse(data) -end -function bin:tofile(name) - if self.stream then return end - if not name then error("Must include a filename to save as!") end - file = io.open(name, "wb") - file:write(self.data) - file:close() -end -function bin:close() - if self.stream then - if bin.streams[self.file][2]==1 then - bin.streams[self.file]=nil - self.workingfile:close() - else - bin.streams[self.file][2]=bin.streams[self.file][2]-1 - self.workingfile=io.tmpfile() - self.workingfile:close() - end - end -end -function bin:getBlock(t,n) - local data="" - if not n then - if bin.registerBlocks[t] then - return bin.registerBlocks[t][1](nil,self) - else - error("Unknown format! Cannot read from file: "..tostring(t)) - end - else - if t=="n" or t=="%e" or t=="%E" then - data=self:read(n) - local numB=bin.defualtBit.new(data) - local numL=bin.defualtBit.new(string.reverse(data)) - local little=numL:tonumber(0) - local big=numB:tonumber(0) - if t=="%E" then - return big - elseif t=="%X" then - return bin.toHex(data):upper() - elseif t=="%x" then - return bin.toHex(data):lower() - elseif t=="%b" then - return bin.toB64(data) - elseif t=="%e" then - return little - end - return big,little - elseif t=="s" then - return self:read(n) - elseif bin.registerBlocks[t] then - return bin.registerBlocks[t][1](n,self) - else - error("Unknown format! Cannot read from file: "..tostring(t)) - end - end -end -function bin:addBlock(d,fit,fmt) - if not fmt then fmt=type(d):sub(1,1) end - if bin.registerBlocks[fmt] then - self:tackE(bin.registerBlocks[fmt][2](d,fit,fmt,self,bin.registerBlocks[fmt][2])) - elseif type(d)=="number" then - local data=bin.defualtBit.numToBytes(d,fit or 4,fmt,function() - error("Overflow! Space allotted for number is smaller than the number takes up. Increase the fit!") - end) - self:tackE(data) - elseif type(d)=="string" then - local data=d:sub(1,fit or -1) - if #data<(fit or #data) then - data=data..string.rep("\0",fit-#data) - end - self:tackE(data) - end -end -bin.registerBlocks={} -function bin.registerBlock(t,funcG,funcA) - bin.registerBlocks[t]={funcG,funcA} -end -function bin.newDataBuffer(size,fill) -- fills with \0 or nul or with what you enter - local c={} - local fill=fill or "\0" - c.data={self=c} - c.Type="buffer" - c.size=size or 0 -- 0 means an infinite buffer, sometimes useful - for i=1,c.size do - c.data[i]=fill - end - local mt={ - __index=function(t,k) - if type(k)=="number" then - local data=t.data[k] - if data then - return string.byte(data) - else - error("Index out of range!") - end - elseif type(k)=="string" then - local num=tonumber(k) - if num then - local data=t.data[num] - if data then - return data - else - error("Index out of range!") - end - else - error("Only number-strings and numbers can be indexed!") - end - else - error("Only number-strings and numbers can be indexed!") - end - end, - __newindex=function(t,k,v) - if type(k)~="number" then error("Can only set a buffers data with a numeric index!") end - local data="" - if type(v)=="string" then - data=v - elseif type(v)=="number" then - data=string.char(v) - else - -- try to normalize the data of type v - data=bin.normalizeData(v) - end - t:fillBuffer(k,data) - end, - __tostring=function(t) - return t:getData() - end, - } - function c:fillBuffer(a,data) - local len=#data - if len==1 then - self.data[a]=data - else - local i=a-1 - for d in data:gmatch(".") do - i=i+1 - if i>c.size then - return #data-i+a - end - self.data[i]=d - end - return #data-i+(a-1) - end - end - function c:getData(a,b,fmt) -- LATER - local dat=bin.new(table.concat(self.data,"",a,b)) - local n=dat:getSize() - return dat:getBlock(fmt or "s",n) - end - function c:getSize() - return #self:getData() - end - setmetatable(c,mt) - return c -end -function bin:newDataBufferFromStream(pos,size,fill) -- fills with \0 or nul or with what you enter IF the nothing exists inside the bin file. - local s=self:getSize() - if not self.stream then error("Can only created a streamed buffer on a streamable file!") end - if s==0 then - self:write(string.rep("\0",pos+size)) - end - self:setSeek(1) - local c=bin.newDataBuffer(size,fill) - rawset(c,"pos",pos) - rawset(c,"size",size) - rawset(c,"fill",fill) - rawset(c,"bin",self) - rawset(c,"sync",function(self) - local cur=self.bin:getSeek() - self.bin:setSeek(self.pos) - self.bin:write(self:getData(),size) - self.bin:setSeek(cur) - end) - c:fillBuffer(1,self:sub(pos,pos+size)) - function c:fillBuffer(a,data) - local len=#data - if len==1 then - self.data[a]=data - self:sync() - else - local i=a-1 - for d in data:gmatch(".") do - i=i+1 - if i>c.size then - self:sync() - return #data-i+a - end - self.data[i]=d - end - self:sync() - return #data-i+(a-1) - end - end - return c -end -function bin:toDataBuffer() - local s=self:getSize() - -- if self:canStreamWrite() then - -- return self:newDataBufferFromStream(0,s) - -- end - local buf=bin.newDataBuffer(s) - local data=self:read(512) - local i=1 - while data~=nil do - buf[i]=data - data=self:read(512) - i=i+512 - end - return buf -end -function bin:getMD5Hash() - self:setSeek(1) - local len=self:getSize() - local md5=bin.md5.new() - local SIZE=2048 - if len>SIZE then - local dat=self:read(SIZE) - while dat~=nil do - md5:update(dat) - dat=self:read(SIZE) - end - return bin.md5.tohex(md5:finish()):upper() - else - return bin.md5.sumhexa(self:getData()):upper() - end -end -function bin:getHash() - if self:getSize()==0 then - return "NaN" - end - n=32 - local rand = randomGen:newND(1,self:getSize(),self:getSize()) - local h,g={},0 - for i=1,n do - g=rand:nextInt() - table.insert(h,bin.toHex(self:sub(g,g))) - end - return table.concat(h,'') -end -function bin:flipbits() - if self:canStreamWrite() then - self:setSeek(1) - for i=1,self:getSize() do - self:write(string.char(255-string.byte(self:sub(i,i)))) - end - else - local temp={} - for i=1,#self.data do - table.insert(temp,string.char(255-string.byte(string.sub(self.data,i,i)))) - end - self.data=table.concat(temp,'') - end -end -function bin:encrypt() - self:flipbits() -end -function bin:decrypt() - self:flipbits() -end --- Use with small files! -function bin:gsub(...) - local data=self:getData() - local pos=self:getSeek() - self:setSeek(1) - self:write((data:gsub(...)) or data) - self:setSeek(loc) -end -function bin:gmatch(pat) - return self:getData():gmatch(pat) -end -function bin:match(pat) - return self:getData():match(pat) -end -function bin:trim() - local data=self:getData() - local pos=self:getSeek() - self:setSeek(1) - self:write(data:match'^()%s*$' and '' or data:match'^%s*(.*%S)') - self:setSeek(loc) -end -function bin:lines() - local t = {} - local function helper(line) table.insert(t, line) return '' end - helper((self:getData():gsub('(.-)\r?\n', helper))) - return t -end -function bin._lines(str) - local t = {} - local function helper(line) table.insert(t, line) return '' end - helper((str:gsub('(.-)\r?\n', helper))) - return t -end -function bin:wipe() - if self:canStreamWrite() then - self:close() - local c=bin.freshStream(self.file) - self.workingfile=c.workingfile - else - self.data="" - end - self:setSeek(1) -end -function bin:fullTrim(empty) - local t=self:lines() - for i=#t,1,-1 do - t[i]=bin._trim(t[i]) - if empty then - if t[i]=="" then - table.remove(t,i) - end - end - end - self:wipe() - self:write(table.concat(t,"\n")) -end -require("bin.support.extraBlocks") -- registered blocks that you can use -if love then - function bin.load(file,s,r) - content, size = love.filesystem.read(file) - local temp=bin.new(content) - temp.filepath=file - return temp - end - function bin:tofile(filename) - if not(filename) or self.Stream then return nil end - love.filesystem.write(filename,self.data) - end - function bin.stream(file) - return bin.newStreamFileObject(love.filesystem.newFile(file)) - end - function bin:getSize(fmt) - local len=0 - if self.stream then - local len=self.workingfile:getSize() - else - len=#self.data - end - if fmt=="%b" then - return bin.toB64() - elseif fmt then - return string.format(fmt, len) - else - return len - end - end - function bin:getSeek() - if self.stream then - return self.workingfile:tell()+1 - else - return self.pos - end - end - function bin:setSeek(n) - if self.stream then - self.workingfile:seek(n-1) - else - self.pos=n - end - end - function bin:seek(n) - if self.stream then - self.workingfile:seek(n) - else - if not n then return self.pos end - if #self.data-(self.pos-1) 0 then - for i = bnum.len - 2 , 0 , -1 do - for j = 0 , RADIX_LEN - string.len( bnum[i] ) - 1 do - temp = temp .. '0' ; - end - temp = temp .. bnum[i] ; - end - if bnum[bnum.len - 1]==nil then - return "nil" - end - temp = bnum[bnum.len - 1] .. temp ; - if bnum.signal == '-' then - temp = bnum.signal .. temp ; - end - return temp ; - else - return "" ; - end -end - -function BigNum.mt.pow( num1 , num2 ) - local bnum1 = BigNum.new( num1 ) ; - local bnum2 = BigNum.new( num2 ) ; - return BigNum.pow( bnum1 , bnum2 ) ; -end - -function BigNum.mt.eq( num1 , num2 ) - local bnum1 = BigNum.new( num1 ) ; - local bnum2 = BigNum.new( num2 ) ; - return BigNum.eq( bnum1 , bnum2 ) ; -end - -function BigNum.mt.lt( num1 , num2 ) - local bnum1 = BigNum.new( num1 ) ; - local bnum2 = BigNum.new( num2 ) ; - return BigNum.lt( bnum1 , bnum2 ) ; -end - -function BigNum.mt.le( num1 , num2 ) - local bnum1 = BigNum.new( num1 ) ; - local bnum2 = BigNum.new( num2 ) ; - return BigNum.le( bnum1 , bnum2 ) ; -end - -function BigNum.mt.unm( num ) - local ret = BigNum.new( num ) - if ret.signal == '+' then - ret.signal = '-' - else - ret.signal = '+' - end - return ret -end - -BigNum.mt.__metatable = "hidden" -BigNum.mt.__tostring = BigNum.mt.tostring ; -BigNum.mt.__add = BigNum.mt.add ; -BigNum.mt.__sub = BigNum.mt.sub ; -BigNum.mt.__mul = BigNum.mt.mul ; -BigNum.mt.__div = BigNum.mt.div ; -BigNum.mt.__pow = BigNum.mt.pow ; -BigNum.mt.__unm = BigNum.mt.unm ; -BigNum.mt.__mod = BigNum.mt.mod ; -BigNum.mt.__eq = BigNum.mt.eq ; -BigNum.mt.__le = BigNum.mt.le ; -BigNum.mt.__lt = BigNum.mt.lt ; -setmetatable( BigNum.mt, { __index = "inexistent field", __newindex = "not available", __metatable="hidden" } ) ; -function BigNum.add( bnum1 , bnum2 , bnum3 ) - local maxlen = 0 ; - local i = 0 ; - local carry = 0 ; - local signal = '+' ; - local old_len = 0 ; - --Handle the signals - if bnum1 == nil or bnum2 == nil or bnum3 == nil then - error("Function BigNum.add: parameter nil") ; - elseif bnum1.signal == '-' and bnum2.signal == '+' then - bnum1.signal = '+' ; - BigNum.sub( bnum2 , bnum1 , bnum3 ) ; - - if not rawequal(bnum1, bnum3) then - bnum1.signal = '-' ; - end - return 0 ; - elseif bnum1.signal == '+' and bnum2.signal == '-' then - bnum2.signal = '+' ; - BigNum.sub( bnum1 , bnum2 , bnum3 ) ; - if not rawequal(bnum2, bnum3) then - bnum2.signal = '-' ; - end - return 0 ; - elseif bnum1.signal == '-' and bnum2.signal == '-' then - signal = '-' ; - end - -- - old_len = bnum3.len ; - if bnum1.len > bnum2.len then - maxlen = bnum1.len ; - else - maxlen = bnum2.len ; - bnum1 , bnum2 = bnum2 , bnum1 ; - end - --School grade sum - for i = 0 , maxlen - 1 do - if bnum2[i] ~= nil then - bnum3[i] = bnum1[i] + bnum2[i] + carry ; - else - bnum3[i] = bnum1[i] + carry ; - end - if bnum3[i] >= RADIX then - bnum3[i] = bnum3[i] - RADIX ; - carry = 1 ; - else - carry = 0 ; - end - end - --Update the answer's size - if carry == 1 then - bnum3[maxlen] = 1 ; - end - bnum3.len = maxlen + carry ; - bnum3.signal = signal ; - for i = bnum3.len, old_len do - bnum3[i] = nil ; - end - return 0 ; -end - -function BigNum.sub( bnum1 , bnum2 , bnum3 ) - local maxlen = 0 ; - local i = 0 ; - local carry = 0 ; - local old_len = 0 ; - if bnum1 == nil or bnum2 == nil or bnum3 == nil then - error("Function BigNum.sub: parameter nil") ; - elseif bnum1.signal == '-' and bnum2.signal == '+' then - bnum1.signal = '+' ; - BigNum.add( bnum1 , bnum2 , bnum3 ) ; - bnum3.signal = '-' ; - if not rawequal(bnum1, bnum3) then - bnum1.signal = '-' ; - end - return 0 ; - elseif bnum1.signal == '-' and bnum2.signal == '-' then - bnum1.signal = '+' ; - bnum2.signal = '+' ; - BigNum.sub( bnum2, bnum1 , bnum3 ) ; - if not rawequal(bnum1, bnum3) then - bnum1.signal = '-' ; - end - if not rawequal(bnum2, bnum3) then - bnum2.signal = '-' ; - end - return 0 ; - elseif bnum1.signal == '+' and bnum2.signal == '-' then - bnum2.signal = '+' ; - BigNum.add( bnum1 , bnum2 , bnum3 ) ; - if not rawequal(bnum2, bnum3) then - bnum2.signal = '-' ; - end - return 0 ; - end - --Tests if bnum2 > bnum1 - if BigNum.compareAbs( bnum1 , bnum2 ) == 2 then - BigNum.sub( bnum2 , bnum1 , bnum3 ) ; - bnum3.signal = '-' ; - return 0 ; - else - maxlen = bnum1.len ; - end - old_len = bnum3.len ; - bnum3.len = 0 ; - --School grade subtraction - for i = 0 , maxlen - 1 do - if bnum2[i] ~= nil then - bnum3[i] = bnum1[i] - bnum2[i] - carry ; - else - bnum3[i] = bnum1[i] - carry ; - end - if bnum3[i] < 0 then - bnum3[i] = RADIX + bnum3[i] ; - carry = 1 ; - else - carry = 0 ; - end - - if bnum3[i] ~= 0 then - bnum3.len = i + 1 ; - end - end - bnum3.signal = '+' ; - --Check if answer's size if zero - if bnum3.len == 0 then - bnum3.len = 1 ; - bnum3[0] = 0 ; - end - if carry == 1 then - error( "Error in function sub" ) ; - end - for i = bnum3.len , max( old_len , maxlen - 1 ) do - bnum3[i] = nil ; - end - return 0 ; -end - -function BigNum.mul( bnum1 , bnum2 , bnum3 ) - local i = 0 ; j = 0 ; - local temp = BigNum.new( ) ; - local temp2 = 0 ; - local carry = 0 ; - local oldLen = bnum3.len ; - if bnum1 == nil or bnum2 == nil or bnum3 == nil then - error("Function BigNum.mul: parameter nil") ; - --Handle the signals - elseif bnum1.signal ~= bnum2.signal then - BigNum.mul( bnum1 , -bnum2 , bnum3 ) ; - bnum3.signal = '-' ; - return 0 ; - end - bnum3.len = ( bnum1.len ) + ( bnum2.len ) ; - --Fill with zeros - for i = 1 , bnum3.len do - bnum3[i - 1] = 0 ; - end - --Places nil where passes through this - for i = bnum3.len , oldLen do - bnum3[i] = nil ; - end - --School grade multiplication - for i = 0 , bnum1.len - 1 do - for j = 0 , bnum2.len - 1 do - carry = ( bnum1[i] * bnum2[j] + carry ) ; - carry = carry + bnum3[i + j] ; - bnum3[i + j] = ( carry % RADIX ) ; - temp2 = bnum3[i + j] ; - carry = math.floor ( carry / RADIX ) ; - end - if carry ~= 0 then - bnum3[i + bnum2.len] = carry ; - end - carry = 0 ; - end - - --Update the answer's size - for i = bnum3.len - 1 , 1 , -1 do - if bnum3[i] ~= nil and bnum3[i] ~= 0 then - break ; - else - bnum3[i] = nil ; - end - bnum3.len = bnum3.len - 1 ; - end - return 0 ; -end - -function BigNum.div( bnum1 , bnum2 , bnum3 , bnum4 ) - local temp = BigNum.new() ; - local temp2 = BigNum.new() ; - local one = BigNum.new( "1" ) ; - local zero = BigNum.new( "0" ) ; - --Check division by zero - if BigNum.compareAbs( bnum2 , zero ) == 0 then - error( "Function BigNum.div: Division by zero" ) ; - end - --Handle the signals - if bnum1 == nil or bnum2 == nil or bnum3 == nil or bnum4 == nil then - error( "Function BigNum.div: parameter nil" ) ; - elseif bnum1.signal == "+" and bnum2.signal == "-" then - bnum2.signal = "+" ; - BigNum.div( bnum1 , bnum2 , bnum3 , bnum4 ) ; - bnum2.signal = "-" ; - bnum3.signal = "-" ; - return 0 ; - elseif bnum1.signal == "-" and bnum2.signal == "+" then - bnum1.signal = "+" ; - BigNum.div( bnum1 , bnum2 , bnum3 , bnum4 ) ; - bnum1.signal = "-" ; - if bnum4 < zero then --Check if remainder is negative - BigNum.add( bnum3 , one , bnum3 ) ; - BigNum.sub( bnum2 , bnum4 , bnum4 ) ; - end - bnum3.signal = "-" ; - return 0 ; - elseif bnum1.signal == "-" and bnum2.signal == "-" then - bnum1.signal = "+" ; - bnum2.signal = "+" ; - BigNum.div( bnum1 , bnum2 , bnum3 , bnum4 ) ; - bnum1.signal = "-" ; - if bnum4 < zero then --Check if remainder is negative - BigNum.add( bnum3 , one , bnum3 ) ; - BigNum.sub( bnum2 , bnum4 , bnum4 ) ; - end - bnum2.signal = "-" ; - return 0 ; - end - temp.len = bnum1.len - bnum2.len - 1 ; - - --Reset variables - BigNum.change( bnum3 , "0" ) ; - BigNum.change( bnum4 , "0" ) ; - - BigNum.copy( bnum1 , bnum4 ) ; - - --Check if can continue dividing - while( BigNum.compareAbs( bnum4 , bnum2 ) ~= 2 ) do - if bnum4[bnum4.len - 1] >= bnum2[bnum2.len - 1] then - BigNum.put( temp , math.floor( bnum4[bnum4.len - 1] / bnum2[bnum2.len - 1] ) , bnum4.len - bnum2.len ) ; - temp.len = bnum4.len - bnum2.len + 1 ; - else - BigNum.put( temp , math.floor( ( bnum4[bnum4.len - 1] * RADIX + bnum4[bnum4.len - 2] ) / bnum2[bnum2.len -1] ) , bnum4.len - bnum2.len - 1 ) ; - temp.len = bnum4.len - bnum2.len ; - end - - if bnum4.signal ~= bnum2.signal then - temp.signal = "-"; - else - temp.signal = "+"; - end - BigNum.add( temp , bnum3 , bnum3 ) ; - temp = temp * bnum2 ; - BigNum.sub( bnum4 , temp , bnum4 ) ; - end - - --Update if the remainder is negative - if bnum4.signal == '-' then - decr( bnum3 ) ; - BigNum.add( bnum2 , bnum4 , bnum4 ) ; - end - return 0 ; -end - -function BigNum.pow( bnum1 , bnum2 ) - local n = BigNum.new( bnum2 ) ; - local y = BigNum.new( 1 ) ; - local z = BigNum.new( bnum1 ) ; - local zero = BigNum.new( "0" ) ; - if bnum2 < zero then - error( "Function BigNum.exp: domain error" ) ; - elseif bnum2 == zero then - return y ; - end - while 1 do - if ( n[0] % 2 ) == 0 then - n = n / 2 ; - else - n = n / 2 ; - y = z * y ; - if n == zero then - return y ; - end - end - z = z * z ; - end -end --- Portugus : -BigNum.exp = BigNum.pow - -function BigNum.gcd( bnum1 , bnum2 ) - local a = {} ; - local b = {} ; - local c = {} ; - local d = {} ; - local zero = {} ; - zero = BigNum.new( "0" ) ; - if bnum1 == zero or bnum2 == zero then - return BigNum.new( "1" ) ; - end - a = BigNum.new( bnum1 ) ; - b = BigNum.new( bnum2 ) ; - a.signal = '+' ; - b.signal = '+' ; - c = BigNum.new() ; - d = BigNum.new() ; - while b > zero do - BigNum.div( a , b , c , d ) ; - a , b , d = b , d , a ; - end - return a ; -end --- Portugus: -BigNum.mmc = BigNum.gcd - -function BigNum.eq( bnum1 , bnum2 ) - if BigNum.compare( bnum1 , bnum2 ) == 0 then - return true ; - else - return false ; - end -end - -function BigNum.lt( bnum1 , bnum2 ) - if BigNum.compare( bnum1 , bnum2 ) == 2 then - return true ; - else - return false ; - end -end - -function BigNum.le( bnum1 , bnum2 ) - local temp = -1 ; - temp = BigNum.compare( bnum1 , bnum2 ) - if temp == 0 or temp == 2 then - return true ; - else - return false ; - end -end - -function BigNum.compareAbs( bnum1 , bnum2 ) - if bnum1 == nil or bnum2 == nil then - error("Function compare: parameter nil") ; - elseif bnum1.len > bnum2.len then - return 1 ; - elseif bnum1.len < bnum2.len then - return 2 ; - else - local i ; - for i = bnum1.len - 1 , 0 , -1 do - if bnum1[i] > bnum2[i] then - return 1 ; - elseif bnum1[i] < bnum2[i] then - return 2 ; - end - end - end - return 0 ; -end - -function BigNum.compare( bnum1 , bnum2 ) - local signal = 0 ; - - if bnum1 == nil or bnum2 == nil then - error("Funtion BigNum.compare: parameter nil") ; - elseif bnum1.signal == '+' and bnum2.signal == '-' then - return 1 ; - elseif bnum1.signal == '-' and bnum2.signal == '+' then - return 2 ; - elseif bnum1.signal == '-' and bnum2.signal == '-' then - signal = 1 ; - end - if bnum1.len > bnum2.len then - return 1 + signal ; - elseif bnum1.len < bnum2.len then - return 2 - signal ; - else - local i ; - for i = bnum1.len - 1 , 0 , -1 do - if bnum1[i] > bnum2[i] then - return 1 + signal ; - elseif bnum1[i] < bnum2[i] then - return 2 - signal ; - end - end - end - return 0 ; -end - -function BigNum.copy( bnum1 , bnum2 ) - if bnum1 ~= nil and bnum2 ~= nil then - local i ; - for i = 0 , bnum1.len - 1 do - bnum2[i] = bnum1[i] ; - end - bnum2.len = bnum1.len ; - else - error("Function BigNum.copy: parameter nil") ; - end -end - -function BigNum.change( bnum1 , num ) - local j = 0 ; - local len = 0 ; - local num = num ; - local l ; - local oldLen = 0 ; - if bnum1 == nil then - error( "BigNum.change: parameter nil" ) ; - elseif type( bnum1 ) ~= "table" then - error( "BigNum.change: parameter error, type unexpected" ) ; - elseif num == nil then - bnum1.len = 1 ; - bnum1[0] = 0 ; - bnum1.signal = "+"; - elseif type( num ) == "table" and num.len ~= nil then --check if num is a big number - --copy given table to the new one - for i = 0 , num.len do - bnum1[i] = num[i] ; - end - if num.signal ~= '-' and num.signal ~= '+' then - bnum1.signal = '+' ; - else - bnum1.signal = num.signal ; - end - oldLen = bnum1.len ; - bnum1.len = num.len ; - elseif type( num ) == "string" or type( num ) == "number" then - if string.sub( num , 1 , 1 ) == '+' or string.sub( num , 1 , 1 ) == '-' then - bnum1.signal = string.sub( num , 1 , 1 ) ; - num = string.sub(num, 2) ; - else - bnum1.signal = '+' ; - end - num = string.gsub( num , " " , "" ) ; - local sf = string.find( num , "e" ) ; - --Handles if the number is in exp notation - if sf ~= nil then - num = string.gsub( num , "%." , "" ) ; - local e = string.sub( num , sf + 1 ) ; - e = tonumber(e) ; - if e ~= nil and e > 0 then - e = tonumber(e) ; - else - error( "Function BigNum.change: string is not a valid number" ) ; - end - num = string.sub( num , 1 , sf - 2 ) ; - for i = string.len( num ) , e do - num = num .. "0" ; - end - else - sf = string.find( num , "%." ) ; - if sf ~= nil then - num = string.sub( num , 1 , sf - 1 ) ; - end - end - - l = string.len( num ) ; - oldLen = bnum1.len ; - if (l > RADIX_LEN) then - local mod = l-( math.floor( l / RADIX_LEN ) * RADIX_LEN ) ; - for i = 1 , l-mod, RADIX_LEN do - bnum1[j] = tonumber( string.sub( num, -( i + RADIX_LEN - 1 ) , -i ) ); - --Check if string dosn't represents a number - if bnum1[j] == nil then - error( "Function BigNum.change: string is not a valid number" ) ; - bnum1.len = 0 ; - return 1 ; - end - j = j + 1 ; - len = len + 1 ; - end - if (mod ~= 0) then - bnum1[j] = tonumber( string.sub( num , 1 , mod ) ) ; - bnum1.len = len + 1 ; - else - bnum1.len = len ; - end - --Eliminate trailing zeros - for i = bnum1.len - 1 , 1 , -1 do - if bnum1[i] == 0 then - bnum1[i] = nil ; - bnum1.len = bnum1.len - 1 ; - else - break ; - end - end - - else - -- string.len(num) <= RADIX_LEN - bnum1[j] = tonumber( num ) ; - bnum1.len = 1 ; - end - else - error( "Function BigNum.change: parameter error, type unexpected" ) ; - end - - --eliminates the deprecated higher order 'algarisms' - if oldLen ~= nil then - for i = bnum1.len , oldLen do - bnum1[i] = nil ; - end - end - - return 0 ; -end - -function BigNum.put( bnum , int , pos ) - if bnum == nil then - error("Function BigNum.put: parameter nil") ; - end - local i = 0 ; - for i = 0 , pos - 1 do - bnum[i] = 0 ; - end - bnum[pos] = int ; - for i = pos + 1 , bnum.len do - bnum[i] = nil ; - end - bnum.len = pos ; - return 0 ; -end - ---printraw{{{2 -function printraw( bnum ) - local i = 0 ; - if bnum == nil then - error( "Function printraw: parameter nil" ) ; - end - while 1 == 1 do - if bnum[i] == nil then - io.write( ' len '..bnum.len ) ; - if i ~= bnum.len then - io.write( ' ERRO!!!!!!!!' ) ; - end - io.write( "\n" ) ; - return 0 ; - end - io.write( 'r'..bnum[i] ) ; - i = i + 1 ; - end -end ---max{{{2 -function max( int1 , int2 ) - if int1 > int2 then - return int1 ; - else - return int2 ; - end -end - ---decr{{{2 -function decr( bnum1 ) - local temp = {} ; - temp = BigNum.new( "1" ) ; - BigNum.sub( bnum1 , temp , bnum1 ) ; - return 0 ; -end diff --git a/examples/love2d Threading Example/bin/numbers/BigRat.lua b/examples/love2d Threading Example/bin/numbers/BigRat.lua deleted file mode 100644 index 40e9777..0000000 --- a/examples/love2d Threading Example/bin/numbers/BigRat.lua +++ /dev/null @@ -1,227 +0,0 @@ -require( "bin.numbers.BigNum" ) ; - -BigRat = {} ; -BigRat.mt = {} ; -function BigRat.new( num1 , num2 ) --{{{2 - local bigrat = {} ; - local f ; - setmetatable(bigrat, BigRat.mt) ; - if type( num1 ) == "table" then - if num1.num ~= nil and num1.den ~= nil then - bigrat.num = BigNum.new( num1.num ) ; - bigrat.den = BigNum.new( num1.den ) ; - else - bigrat.num = BigNum.new( num1 ) ; - bigrat.den = BigNum.new( "1" ) ; - end - elseif num1 ~= nil then - if num2 == nil then - bigrat.den = BigNum.new( "1" ) ; - else - bigrat.den = BigNum.new( num2 ) ; - end - bigrat.num = BigNum.new( num1 ) ; - else - bigrat.den = BigNum.new( ) ; - bigrat.num = BigNum.new( ) ; - end - - --Update the signals - if bigrat.den.signal == "-" then - if bigrat.num.signal == "-" then - bigrat.num.signal = "+" ; - else - bigrat.num.signal = "-" ; - end - bigrat.den.signal = "+" ; - end - - return bigrat ; -end - -function BigRat.mt.sub( num1 , num2 ) - local temp = BigRat.new() ; - local brat1 = BigRat.new( num1 ) ; - local brat2 = BigRat.new( num2 ) ; - BigRat.sub( brat1 , brat2 , temp ) ; - return temp ; -end - -function BigRat.mt.add( num1 , num2 ) - local temp = BigRat.new() ; - local brat1 = BigRat.new( num1 ) ; - local brat2 = BigRat.new( num2 ) ; - BigRat.add( brat1 , brat2 , temp ) ; - return temp ; -end - -function BigRat.mt.mul( num1 , num2 ) - local temp = BigRat.new() ; - local brat1 = BigRat.new( num1 ) ; - local brat2 = BigRat.new( num2 ) ; - BigRat.mul( brat1 , brat2 , temp ) ; - return temp ; -end - -function BigRat.mt.div( num1 , num2 ) - local brat1 = BigRat.new( num1 ) ; - local brat2 = BigRat.new( num2 ) ; - local brat3 = BigRat.new() ; - local brat4 = BigRat.new() ; - BigRat.div( brat1 , brat2 , brat3 , brat4 ) ; - return brat3 , brat4 ; -end - -function BigRat.mt.tostring( brat ) - BigRat.simplify( brat ) ; - return BigNum.mt.tostring( brat.num ) .. " / " .. BigNum.mt.tostring( brat.den ) ; -end - -function BigRat.mt.pow ( num1 , num2 ) - local brat1 = BigRat.new( num1 ) ; - local brat2 = BigRat.new( num2 ) ; - return BigRat.pow( brat1 , brat2 ) -end - -function BigRat.mt.eq ( num1 , num2 ) - return BigRat.eq( num1 , num2 ) -end - -function BigRat.mt.lt ( num1 , num2 ) - return BigRat.lt( num1 , num2 ) -end - -function BigRat.mt.le ( num1 , num2 ) - return BigRat.le( num1 , num2 ) -end - -function BigRat.mt.unm ( num ) - local ret = BigRat.new( num ) - if ret.num.signal == '-' then - ret.num.signal = '+' - else - ret.num.signal = '-' - end - return ret -end - -BigRat.mt.__metatable = "hidden" -BigRat.mt.__tostring = BigRat.mt.tostring -BigRat.mt.__add = BigRat.mt.add -BigRat.mt.__sub = BigRat.mt.sub -BigRat.mt.__mul = BigRat.mt.mul -BigRat.mt.__div = BigRat.mt.div -BigRat.mt.__pow = BigRat.mt.pow -BigRat.mt.__unm = BigRat.mt.unm -BigRat.mt.__eq = BigRat.mt.eq -BigRat.mt.__le = BigRat.mt.le -BigRat.mt.__lt = BigRat.mt.lt -setmetatable( BigRat.mt, { __index = "inexistent field", __newindex = "not available", __metatable="hidden" } ) ; -function BigRat.add( brat1 , brat2 , brat3 ) - brat3.den = brat1.den * brat2.den ; - brat3.num = ( brat1.num * brat2.den ) + ( brat2.num * brat1.den ) ; - return brat3 ; -end -function BigRat.sub( brat1 , brat2 , brat3 ) - brat3.den = brat1.den * brat2.den ; - brat3.num = ( brat1.num * brat2.den ) - ( brat2.num * brat1.den ) ; - return brat3 ; -end - -function BigRat.mul( brat1 , brat2 , brat3 ) - brat3.num = brat1.num * brat2.num ; - brat3.den = brat1.den * brat2.den ; - return 0 ; -end - -function BigRat.div( brat1 , brat2 , brat3 ) - brat3.num = brat1.num * brat2.den ; - brat3.den = brat1.den * brat2.num ; - return brat3 ; -end - -function BigRat.pow( bnum1 , bnum2 ) - if bnum1 == nil or bnum2 == nil then - error( "Function BigRat.pow: parameter nil" ) ; - end - local x = BigRat.new( "8" ) ; - local n = BigRat.new( bnum2.den ) ; - local n2 ; - local y = BigRat.new( ) ; - local i ; - local temp = BigRat.new( ) ; - - BigRat.simplify( bnum2 ) ; - temp.num = BigNum.exp( bnum1.num , bnum2.num ) ; - temp.den = BigNum.exp( bnum1.den , bnum2.num ) ; - n2 = n - 1 ; - - for i = 0 , 4 do - y.num = x.num ^ n2.num ; - y.den = x.den ^ n2.num ; - x = (( temp / y ) + ( n2 * x )) / n ; - end - return x ; -end - -function BigRat.simplify( brat ) - if brat == nil then - error( "Function BigRat.simplify: parameter nil" ) ; - end - local gcd = BigNum.new( ) ; - local temp = BigRat.new( brat ) ; - local devnull = BigNum.new( ) ; - local zero = BigNum.new( "0" ) ; - --Check if numerator is zero - if BigNum.compareAbs( brat.num , zero ) == 0 then - brat.den = BigNum.new( "1" ) ; - return 0 ; - end - gcd = BigNum.gcd( brat.num , brat.den ) ; - BigNum.div( temp.num , gcd , brat.num , devnull ) ; - BigNum.div( temp.den , gcd , brat.den , devnull ) ; - --Update the signal - if brat.num.signal == '-' and brat.den.signal == '-' then - brat.num.signal = '+' ; - brat.den.signal = '+' ; - end - return 0 ; -end - -function BigRat.eq( brat1 , brat2 ) - if BigRat.compare( brat1 , brat2 ) == 0 then - return true ; - else - return false ; - end -end - -function BigRat.lt( brat1 , brat2 ) - if BigRat.compare( brat1 , brat2 ) == 2 then - return true ; - else - return false ; - end -end - -function BigRat.le( brat1 , brat2 ) - local temp = -1 ; - temp = BigRat.compare( brat1 , brat2 ) - if temp == 0 or temp == 2 then - return true ; - else - return false ; - end -end - -function BigRat.compare( bnum1 , bnum2 ) - local temp ; - temp = bnum1 - bnum2 ; - if temp.num[0] == 0 and temp.num.len == 1 then --Check if is zero - return 0 ; - elseif temp.num.signal == "-" then - return 2 ; - else - return 1 ; - end -end diff --git a/examples/love2d Threading Example/bin/numbers/bits.lua b/examples/love2d Threading Example/bin/numbers/bits.lua deleted file mode 100644 index 579f320..0000000 --- a/examples/love2d Threading Example/bin/numbers/bits.lua +++ /dev/null @@ -1,191 +0,0 @@ -local bits={} -bits.data='' -bits.t='bits' -bits.Type='bits' -bits.__index = bits -bits.__tostring=function(self) return self.data end -bits.__len=function(self) return (#self.data)/8 end -local floor,insert = math.floor, table.insert -function bits.newBitBuffer(n) - -- -end -function bits.newConverter(bitsIn,bitsOut) - local c={} - -- -end -function basen(n,b) - if not b or b == 10 then return tostring(n) end - local digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" - local t = {} - local sign = "" - if n < 0 then - sign = "-" - n = -n - end - repeat - local d = n % b + 1 - n = n / b - insert(t, 1, digits:sub(d,d)) - until n == 0 - return sign .. table.concat(t,"") -end -bits.ref={} -function bits.newByte(d) - local c={} - if type(d)=="string" then - if #d>1 or #d<1 then - error("A byte must be one character!") - else - c.data=string.byte(d) - end - elseif type(d)=="number" then - if d>255 or d<0 then - error("A byte must be between 0 and 255!") - else - c.data=d - end - else - error("cannot use type "..type(d).." as an argument! Takes only strings or numbers!") - end - c.__index=function(self,k) - if k>=0 and k<9 then - if self.data==0 then - return 0 - elseif self.data==255 then - return 1 - else - return bits.ref[self.data][k] - end - end - end - c.__tostring=function(self) - return bits.ref[tostring(self.data)] - end - setmetatable(c,c) - return c -end -function bits.newByteArray(s) - local c={} - if type(s)~="string" then - error("Must be a string type or bin/buffer type") - elseif type(s)=="table" then - if s.t=="sink" or s.t=="buffer" or s.t=="bin" then - local data=s:getData() - for i=1,#data do - c[#c+1]=bits.newByte(data:sub(i,i)) - end - else - error("Must be a string type or bin/buffer type") - end - else - for i=1,#s do - c[#c+1]=bits.newByte(s:sub(i,i)) - end - end - return c -end -function bits.new(n,binary) - local temp={} - temp.t="bits" - temp.Type="bits" - if type(n)=="string" then - if binary then - temp.data=n:match("[10]+") - else - local t={} - for i=#n,1,-1 do - table.insert(t,bits:conv(string.byte(n,i))) - end - temp.data=table.concat(t) - end - elseif type(n)=="number" or type(n)=="table" then - temp.data=basen(n,2) - end - if #temp.data%8~=0 then - temp.data=string.rep('0',8-#temp.data%8)..temp.data - end - setmetatable(temp, bits) - return temp -end -for i=0,255 do - local d=bits.new(i).data - bits.ref[i]={d:match("(%d)(%d)(%d)(%d)(%d)(%d)(%d)(%d)")} - bits.ref[tostring(i)]=d - bits.ref[d]=i - bits.ref["\255"..string.char(i)]=d -end -function bits.numToBytes(n,fit,func) - local num=string.reverse(bits.new(n):toSbytes()) - local ref={["num"]=num,["fit"]=fit} - if fit then - if fit<#num then - if func then - print("Warning: attempting to store a number that takes up more space than allotted! Using provided method!") - func(ref) - else - print("Warning: attempting to store a number that takes up more space than allotted!") - end - return ref.num:sub(1,ref.fit) - elseif fit==#num then - return string.reverse(num) - else - return string.reverse(string.rep("\0",fit-#num)..num) - end - else - return string.reverse(num) - end -end -function bits:conv(n) - local tab={} - while n>=1 do - table.insert(tab,n%2) - n=math.floor(n/2) - end - local str=string.reverse(table.concat(tab)) - if #str%8~=0 or #str==0 then - str=string.rep('0',8-#str%8)..str - end - return str -end -function bits:tonumber(s,e) - if s==0 then - return tonumber(self.data,2) - end - s=s or 1 - return tonumber(string.sub(self.data,(8*(s-1))+1,8*s),2) or error('Bounds!') -end -function bits:isover() - return #self.data>8 -end -function bits:flipbits() - tab={} - for i=1,#self.data do - if string.sub(self.data,i,i)=='1' then - table.insert(tab,'0') - else - table.insert(tab,'1') - end - end - self.data=table.concat(tab) -end -function bits:tobytes() - local tab={} - for i=self:getbytes(),1,-1 do - table.insert(tab,string.char(self:tonumber(i))) - end - return bin.new(table.concat(tab)) -end -function bits:toSbytes() - local tab={} - for i=self:getbytes(),1,-1 do - table.insert(tab,string.char(self:tonumber(i))) - end - return table.concat(tab) -end -function bits:getBin() - return self.data -end -function bits:getbytes() - return #self.data/8 -end -return bits diff --git a/examples/love2d Threading Example/bin/numbers/infinabits.lua b/examples/love2d Threading Example/bin/numbers/infinabits.lua deleted file mode 100644 index 69c45ff..0000000 --- a/examples/love2d Threading Example/bin/numbers/infinabits.lua +++ /dev/null @@ -1,244 +0,0 @@ -local binNum=require("bin.numbers.BigNum") -local infinabits={} -infinabits.data='' -infinabits.t='infinabits' -infinabits.Type='infinabits' -infinabits.__index = infinabits -infinabits.__tostring=function(self) return self.data end -infinabits.__len=function(self) return (#self.data)/8 end -local floor,insert = math.floor, table.insert -function basen(n,b) - n=BigNum.new(n) - if not b or b == 10 then return tostring(n) end - local digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" - local t = {} - local sign = "" - if n < BigNum.new(0) then - sign = "-" - n = -n - end - repeat - local d = tonumber(tostring(n % b)) + 1 - n = n / b - insert(t, 1, digits:sub(d,d)) - until n == BigNum.new(0) - return sign .. table.concat(t,"") -end -function base2to10(num) - local n=BigNum.new(0) - for i = #num-1,0,-1 do - nn=BigNum.new(num:sub(i+1,i+1))*(BigNum.new(2)^((#num-i)-1)) - n=n+nn - end - return n -end -function infinabits.newBitBuffer(n) - -- WIP -end -function infinabits.newConverter(bitsIn,bitsOut) - local c={} - -- WIP -end -infinabits.ref={} -function infinabits.newByte(d)-- WIP - local c={} - if type(d)=="string" then - if #d>1 or #d<1 then - error("A byte must be one character!") - else - c.data=string.byte(d) - end - elseif type(d)=="number" then - if d>255 or d<0 then - error("A byte must be between 0 and 255!") - else - c.data=d - end - else - error("cannot use type "..type(d).." as an argument! Takes only strings or numbers!") - end - c.__index=function(self,k) - if k>=0 and k<9 then - if self.data==0 then - return 0 - elseif self.data==255 then - return 1 - else - return infinabits.ref[self.data][k] - end - end - end - c.__tostring=function(self) - return infinabits.ref[tostring(self.data)] - end - setmetatable(c,c) - return c -end -function infinabits.newByteArray(s)-- WIP - local c={} - if type(s)~="string" then - error("Must be a string type or bin/buffer type") - elseif type(s)=="table" then - if s.t=="sink" or s.t=="buffer" or s.t=="bin" then - local data=s:getData() - for i=1,#data do - c[#c+1]=infinabits.newByte(data:sub(i,i)) - end - else - error("Must be a string type or bin/buffer type") - end - else - for i=1,#s do - c[#c+1]=infinabits.newByte(s:sub(i,i)) - end - end - return c -end -function infinabits.new(n,binary) - local temp={} - temp.t="infinabits" - temp.Type="infinabits" - if type(n)=="string" then - if binary then - temp.data=n:match("[10]+") - else - local t={} - for i=#n,1,-1 do - table.insert(t,infinabits:conv(string.byte(n,i))) - end - temp.data=table.concat(t) - end - elseif type(n)=="number" or type(n)=="table" then - temp.data=basen(tostring(n),2) - end - if #temp.data%8~=0 then - temp.data=string.rep('0',8-#temp.data%8)..temp.data - end - setmetatable(temp, infinabits) - return temp -end -for i=0,255 do - local d=infinabits.new(i).data - infinabits.ref[i]={d:match("(%d)(%d)(%d)(%d)(%d)(%d)(%d)(%d)")} - infinabits.ref[tostring(i)]=d - infinabits.ref[d]=i - infinabits.ref["\255"..string.char(i)]=d -end -function infinabits.numToBytes(n,fit,func) - local num=string.reverse(infinabits.new(BigNum.new(n)):toSbytes()) - local ref={["num"]=num,["fit"]=fit} - if fit then - if fit<#num then - if func then - print("Warning: attempting to store a number that takes up more space than allotted! Using provided method!") - func(ref) - else - print("Warning: attempting to store a number that takes up more space than allotted!") - end - return ref.num:sub(1,ref.fit) - elseif fit==#num then - return string.reverse(num) - else - return string.reverse(string.rep("\0",fit-#num)..num) - end - else - return string.reverse(num) - end -end -function infinabits.numToBytes(n,fit,fmt,func) - if fmt=="%e" then - local num=string.reverse(infinabits.new(BigNum.new(n)):toSbytes()) - local ref={["num"]=num,["fit"]=fit} - if fit then - if fit<#num then - if func then - print("Warning: attempting to store a number that takes up more space than allotted! Using provided method!") - func(ref) - else - print("Warning: attempting to store a number that takes up more space than allotted!") - end - return ref.num:sub(1,ref.fit) - elseif fit==#num then - return num - else - return string.rep("\0",fit-#num)..num - end - else - return num - end - - else - local num=string.reverse(infinabits.new(BigNum.new(n)):toSbytes()) - local ref={["num"]=num,["fit"]=fit} - if fit then - if fit<#num then - if func then - print("Warning: attempting to store a number that takes up more space than allotted! Using provided method!") - func(ref) - else - print("Warning: attempting to store a number that takes up more space than allotted!") - end - return ref.num:sub(1,ref.fit) - elseif fit==#num then - return string.reverse(num) - else - return string.reverse(string.rep("\0",fit-#num)..num) - end - else - return string.reverse(num) - end - end -end -function infinabits:conv(n) - local tab={} - local one=BigNum.new(1) - local n=BigNum.new(n) - while n>=one do - table.insert(tab,tonumber(tostring(n%2))) - n=n/2 - end - local str=string.reverse(table.concat(tab)) - if #str%8~=0 or #str==0 then - str=string.rep('0',8-#str%8)..str - end - return str -end -function infinabits:tonumber(s) - if s==0 then - return tonumber(self.data,2) - end - s=s or 1 - return tonumber(tostring(base2to10(string.sub(self.data,(8*(s-1))+1,8*s)))) or error('Bounds!') -end -function infinabits:isover() - return #self.data>8 -end -function infinabits:flipbits() - tab={} - local s=self.data - s=s:gsub("1","_") - s=s:gsub("0","1") - s=s:gsub("_","0") - self.data=s -end -function infinabits:tobytes() - local tab={} - for i=self:getbytes(),1,-1 do - table.insert(tab,string.char(self:tonumber(i))) - end - return bin.new(table.concat(tab)) -end -function infinabits:toSbytes() - local tab={} - for i=self:getbytes(),1,-1 do - table.insert(tab,string.char(self:tonumber(i))) - end - return table.concat(tab) -end -function infinabits:getBin() - return self.data -end -function infinabits:getbytes() - return #self.data/8 -end -return infinabits diff --git a/examples/love2d Threading Example/bin/numbers/no_jit_bit.lua b/examples/love2d Threading Example/bin/numbers/no_jit_bit.lua deleted file mode 100644 index 2cfdc1d..0000000 --- a/examples/love2d Threading Example/bin/numbers/no_jit_bit.lua +++ /dev/null @@ -1,333 +0,0 @@ ---[[ -LICENSE - - (c) 2008-2011 David Manura. Licensed under the same terms as Lua (MIT). ---]] - -local M = {_TYPE='module', _NAME='bit.numberlua', _VERSION='0.3.1.20120131'} - -local floor = math.floor - -local MOD = 2^32 -local MODM = MOD-1 - -local function memoize(f) - local mt = {} - local t = setmetatable({}, mt) - function mt:__index(k) - local v = f(k); t[k] = v - return v - end - return t -end - -local function make_bitop_uncached(t, m) - local function bitop(a, b) - local res,p = 0,1 - while a ~= 0 and b ~= 0 do - local am, bm = a%m, b%m - res = res + t[am][bm]*p - a = (a - am) / m - b = (b - bm) / m - p = p*m - end - res = res + (a+b)*p - return res - end - return bitop -end - -local function make_bitop(t) - local op1 = make_bitop_uncached(t,2^1) - local op2 = memoize(function(a) - return memoize(function(b) - return op1(a, b) - end) - end) - return make_bitop_uncached(op2, 2^(t.n or 1)) -end - --- ok? probably not if running on a 32-bit int Lua number type platform -function M.tobit(x) - return x % 2^32 -end - -M.bxor = make_bitop {[0]={[0]=0,[1]=1},[1]={[0]=1,[1]=0}, n=4} -local bxor = M.bxor - -function M.bnot(a) return MODM - a end -local bnot = M.bnot - -function M.band(a,b) return ((a+b) - bxor(a,b))/2 end -local band = M.band - -function M.bor(a,b) return MODM - band(MODM - a, MODM - b) end -local bor = M.bor - -local lshift, rshift -- forward declare - -function M.rshift(a,disp) -- Lua5.2 insipred - if disp < 0 then return lshift(a,-disp) end - return floor(a % 2^32 / 2^disp) -end -rshift = M.rshift - -function M.lshift(a,disp) -- Lua5.2 inspired - if disp < 0 then return rshift(a,-disp) end - return (a * 2^disp) % 2^32 -end -lshift = M.lshift - -function M.tohex(x, n) -- BitOp style - n = n or 8 - local up - if n <= 0 then - if n == 0 then return '' end - up = true - n = - n - end - x = band(x, 16^n-1) - return ('%0'..n..(up and 'X' or 'x')):format(x) -end -local tohex = M.tohex - -function M.extract(n, field, width) -- Lua5.2 inspired - width = width or 1 - return band(rshift(n, field), 2^width-1) -end -local extract = M.extract - -function M.replace(n, v, field, width) -- Lua5.2 inspired - width = width or 1 - local mask1 = 2^width-1 - v = band(v, mask1) -- required by spec? - local mask = bnot(lshift(mask1, field)) - return band(n, mask) + lshift(v, field) -end -local replace = M.replace - -function M.bswap(x) -- BitOp style - local a = band(x, 0xff); x = rshift(x, 8) - local b = band(x, 0xff); x = rshift(x, 8) - local c = band(x, 0xff); x = rshift(x, 8) - local d = band(x, 0xff) - return lshift(lshift(lshift(a, 8) + b, 8) + c, 8) + d -end -local bswap = M.bswap - -function M.rrotate(x, disp) -- Lua5.2 inspired - disp = disp % 32 - local low = band(x, 2^disp-1) - return rshift(x, disp) + lshift(low, 32-disp) -end -local rrotate = M.rrotate - -function M.lrotate(x, disp) -- Lua5.2 inspired - return rrotate(x, -disp) -end -local lrotate = M.lrotate - -M.rol = M.lrotate -- LuaOp inspired -M.ror = M.rrotate -- LuaOp insipred - - -function M.arshift(x, disp) -- Lua5.2 inspired - local z = rshift(x, disp) - if x >= 0x80000000 then z = z + lshift(2^disp-1, 32-disp) end - return z -end -local arshift = M.arshift - -function M.btest(x, y) -- Lua5.2 inspired - return band(x, y) ~= 0 -end - -M.bit32 = {} -- Lua 5.2 'bit32' compatibility - - -local function bit32_bnot(x) - return (-1 - x) % MOD -end -M.bit32.bnot = bit32_bnot - -local function bit32_bxor(a, b, c, ...) - local z - if b then - a = a % MOD - b = b % MOD - z = bxor(a, b) - if c then - z = bit32_bxor(z, c, ...) - end - return z - elseif a then - return a % MOD - else - return 0 - end -end -M.bit32.bxor = bit32_bxor - -local function bit32_band(a, b, c, ...) - local z - if b then - a = a % MOD - b = b % MOD - z = ((a+b) - bxor(a,b)) / 2 - if c then - z = bit32_band(z, c, ...) - end - return z - elseif a then - return a % MOD - else - return MODM - end -end -M.bit32.band = bit32_band - -local function bit32_bor(a, b, c, ...) - local z - if b then - a = a % MOD - b = b % MOD - z = MODM - band(MODM - a, MODM - b) - if c then - z = bit32_bor(z, c, ...) - end - return z - elseif a then - return a % MOD - else - return 0 - end -end -M.bit32.bor = bit32_bor - -function M.bit32.btest(...) - return bit32_band(...) ~= 0 -end - -function M.bit32.lrotate(x, disp) - return lrotate(x % MOD, disp) -end - -function M.bit32.rrotate(x, disp) - return rrotate(x % MOD, disp) -end - -function M.bit32.lshift(x,disp) - if disp > 31 or disp < -31 then return 0 end - return lshift(x % MOD, disp) -end - -function M.bit32.rshift(x,disp) - if disp > 31 or disp < -31 then return 0 end - return rshift(x % MOD, disp) -end - -function M.bit32.arshift(x,disp) - x = x % MOD - if disp >= 0 then - if disp > 31 then - return (x >= 0x80000000) and MODM or 0 - else - local z = rshift(x, disp) - if x >= 0x80000000 then z = z + lshift(2^disp-1, 32-disp) end - return z - end - else - return lshift(x, -disp) - end -end - -function M.bit32.extract(x, field, ...) - local width = ... or 1 - if field < 0 or field > 31 or width < 0 or field+width > 32 then error 'out of range' end - x = x % MOD - return extract(x, field, ...) -end - -function M.bit32.replace(x, v, field, ...) - local width = ... or 1 - if field < 0 or field > 31 or width < 0 or field+width > 32 then error 'out of range' end - x = x % MOD - v = v % MOD - return replace(x, v, field, ...) -end - -M.bit = {} -- LuaBitOp "bit" compatibility - -function M.bit.tobit(x) - x = x % MOD - if x >= 0x80000000 then x = x - MOD end - return x -end -local bit_tobit = M.bit.tobit - -function M.bit.tohex(x, ...) - return tohex(x % MOD, ...) -end - -function M.bit.bnot(x) - return bit_tobit(bnot(x % MOD)) -end - -local function bit_bor(a, b, c, ...) - if c then - return bit_bor(bit_bor(a, b), c, ...) - elseif b then - return bit_tobit(bor(a % MOD, b % MOD)) - else - return bit_tobit(a) - end -end -M.bit.bor = bit_bor - -local function bit_band(a, b, c, ...) - if c then - return bit_band(bit_band(a, b), c, ...) - elseif b then - return bit_tobit(band(a % MOD, b % MOD)) - else - return bit_tobit(a) - end -end -M.bit.band = bit_band - -local function bit_bxor(a, b, c, ...) - if c then - return bit_bxor(bit_bxor(a, b), c, ...) - elseif b then - return bit_tobit(bxor(a % MOD, b % MOD)) - else - return bit_tobit(a) - end -end -M.bit.bxor = bit_bxor - -function M.bit.lshift(x, n) - return bit_tobit(lshift(x % MOD, n % 32)) -end - -function M.bit.rshift(x, n) - return bit_tobit(rshift(x % MOD, n % 32)) -end - -function M.bit.arshift(x, n) - return bit_tobit(arshift(x % MOD, n % 32)) -end - -function M.bit.rol(x, n) - return bit_tobit(lrotate(x % MOD, n % 32)) -end - -function M.bit.ror(x, n) - return bit_tobit(rrotate(x % MOD, n % 32)) -end - -function M.bit.bswap(x) - return bit_tobit(bswap(x % MOD)) -end - -return M diff --git a/examples/love2d Threading Example/bin/numbers/random.lua b/examples/love2d Threading Example/bin/numbers/random.lua deleted file mode 100644 index 091a7f5..0000000 --- a/examples/love2d Threading Example/bin/numbers/random.lua +++ /dev/null @@ -1,232 +0,0 @@ ---[[---------------------------------------- -Random -Not all of this is mine -------------------------------------------]] ---[[------------------------------------ -RandomLua v0.3.1 -Pure Lua Pseudo-Random Numbers Generator -Under the MIT license. -copyright(c) 2011 linux-man ---]]------------------------------------ - -local math_floor = math.floor - -local function normalize(n) - return n % 0x80000000 -end - -local function bit_and(a, b) - local r = 0 - local m = 0 - for m = 0, 31 do - if (a % 2 == 1) and (b % 2 == 1) then r = r + 2^m end - if a % 2 ~= 0 then a = a - 1 end - if b % 2 ~= 0 then b = b - 1 end - a = a / 2 b = b / 2 - end - return normalize(r) -end - -local function bit_or(a, b) - local r = 0 - local m = 0 - for m = 0, 31 do - if (a % 2 == 1) or (b % 2 == 1) then r = r + 2^m end - if a % 2 ~= 0 then a = a - 1 end - if b % 2 ~= 0 then b = b - 1 end - a = a / 2 b = b / 2 - end - return normalize(r) -end - -local function bit_xor(a, b) - local r = 0 - local m = 0 - for m = 0, 31 do - if a % 2 ~= b % 2 then r = r + 2^m end - if a % 2 ~= 0 then a = a - 1 end - if b % 2 ~= 0 then b = b - 1 end - a = a / 2 b = b / 2 - end - return normalize(r) -end - -local function seed() - return normalize(os.time()) -end - ---Mersenne twister -local mersenne_twister = {} -mersenne_twister.__index = mersenne_twister - -function mersenne_twister:randomseed(s) - if not s then s = seed() end - self.mt[0] = normalize(s) - for i = 1, 623 do - self.mt[i] = normalize(0x6c078965 * bit_xor(self.mt[i-1], math_floor(self.mt[i-1] / 0x40000000)) + i) - end -end - -function mersenne_twister:random(a, b) - local y - if self.index == 0 then - for i = 0, 623 do - y = self.mt[(i + 1) % 624] % 0x80000000 - self.mt[i] = bit_xor(self.mt[(i + 397) % 624], math_floor(y / 2)) - if y % 2 ~= 0 then self.mt[i] = bit_xor(self.mt[i], 0x9908b0df) end - end - end - y = self.mt[self.index] - y = bit_xor(y, math_floor(y / 0x800)) - y = bit_xor(y, bit_and(normalize(y * 0x80), 0x9d2c5680)) - y = bit_xor(y, bit_and(normalize(y * 0x8000), 0xefc60000)) - y = bit_xor(y, math_floor(y / 0x40000)) - self.index = (self.index + 1) % 624 - if not a then return y / 0x80000000 - elseif not b then - if a == 0 then return y - else return 1 + (y % a) - end - else - return a + (y % (b - a + 1)) - end -end - -local function twister(s) - local temp = {} - setmetatable(temp, mersenne_twister) - temp.mt = {} - temp.index = 0 - temp:randomseed(s) - return temp -end - ---Linear Congruential Generator -local linear_congruential_generator = {} -linear_congruential_generator.__index = linear_congruential_generator - -function linear_congruential_generator:random(a, b) - local y = (self.a * self.x + self.c) % self.m - self.x = y - if not a then return y / 0x10000 - elseif not b then - if a == 0 then return y - else return 1 + (y % a) end - else - return a + (y % (b - a + 1)) - end -end - -function linear_congruential_generator:randomseed(s) - if not s then s = seed() end - self.x = normalize(s) -end - -local function lcg(s, r) - local temp = {} - setmetatable(temp, linear_congruential_generator) - temp.a, temp.c, temp.m = 1103515245, 12345, 0x10000 --from Ansi C - if r then - if r == 'nr' then temp.a, temp.c, temp.m = 1664525, 1013904223, 0x10000 --from Numerical Recipes. - elseif r == 'mvc' then temp.a, temp.c, temp.m = 214013, 2531011, 0x10000 end--from MVC - end - temp:randomseed(s) - return temp -end - --- Multiply-with-carry -local multiply_with_carry = {} -multiply_with_carry.__index = multiply_with_carry - -function multiply_with_carry:random(a, b) - local m = self.m - local t = self.a * self.x + self.c - local y = t % m - self.x = y - self.c = math_floor(t / m) - if not a then return y / 0x10000 - elseif not b then - if a == 0 then return y - else return 1 + (y % a) end - else - return a + (y % (b - a + 1)) - end -end - -function multiply_with_carry:randomseed(s) - if not s then s = seed() end - self.c = self.ic - self.x = normalize(s) -end - -local function mwc(s, r) - local temp = {} - setmetatable(temp, multiply_with_carry) - temp.a, temp.c, temp.m = 1103515245, 12345, 0x10000 --from Ansi C - if r then - if r == 'nr' then temp.a, temp.c, temp.m = 1664525, 1013904223, 0x10000 --from Numerical Recipes. - elseif r == 'mvc' then temp.a, temp.c, temp.m = 214013, 2531011, 0x10000 end--from MVC - end - temp.ic = temp.c - temp:randomseed(s) - return temp -end --- Little bind for the methods: My code starts -local randomGen={} -randomGen.__index=randomGen -function randomGen:new(s) - local temp={} - setmetatable(temp,randomGen) - temp[1]=twister() - temp[2]=lcg() - temp[3]=mwc() - temp.pos=1 - for i=1,3 do - temp[i]:randomseed(s) - end - return temp -end -function randomGen:randomseed(s) - self.pos=1 - self[1]:randomseed(s) - self[2]:randomseed(s) - self[3]:randomseed(s) -end -function randomGen:randomInt(a,b) - local t=self[self.pos]:random(a,b) - self.pos=self.pos+1 - if self.pos>3 then - self.pos=1 - end - return t -end -function randomGen:newND(a,b,s) - if not(a) or not(b) then error('You must include a range!') end - local temp=randomGen:new(s) - temp.a=a - temp.b=b - temp.range=b-a+1 - temp.dups={no=0} - function temp:nextInt() - local t=self:randomInt(self.a,self.b) - if self.dups[t]==nil then - self.dups[t]=true - self.dups.no=self.dups.no+1 - else - return self:nextInt() - end - if self.dups.no==self.range then - function self:nextInt() - return 1,true - end - return t - else - return t - end - end - function temp:nextIInt() - return function() return self:nextInt() end - end - return temp -end -return randomGen diff --git a/examples/love2d Threading Example/bin/support/extraBlocks.lua b/examples/love2d Threading Example/bin/support/extraBlocks.lua deleted file mode 100644 index 2b8aa3b..0000000 --- a/examples/love2d Threading Example/bin/support/extraBlocks.lua +++ /dev/null @@ -1,146 +0,0 @@ -local __CURRENTVERSION=2 -bin.registerBlock("t",function(SIZE_OR_NIL,ref) - local header=ref:read(3) - if not header:match("(LT.)") then error("Not a valid table struct!") end - if bin.defualtBit.new(header:sub(3,3)):tonumber(1)>__CURRENTVERSION then error("Incompatible Version of LuaTable!") end - local len=ref:getBlock("n",4) -- hehe lets make life easier - local tab={} - local ind - local n=0 - while true do - local _dat=ref:read(2) - if _dat==nil then break end - local it,dt=_dat:match("(.)(.)") - n=n+2 - if it=="N" then -- get the index stuff out of the way first - ind=ref:getBlock("n",4) - n=n+4 - else - indL=ref:getBlock("n",1) - n=n+1+indL - ind=ref:read(indL) - end - if dt=="N" then - tab[ind]=ref:getBlock("d") - n=n+8 - elseif dt=="I" then - tab[ind]=math.huge - ref:getBlock("n",4) - n=n+4 - elseif dt=="i" then - tab[ind]=-math.huge - ref:getBlock("n",4) - n=n+4 - elseif dt=="S" then - local nn=ref:getBlock("n",4) - tab[ind]=ref:read(nn) - n=n+4+nn - elseif dt=="B" then - tab[ind]=({["\255"]=true,["\0"]=false})[ref:read(1)] - n=n+1 - elseif dt=="F" then - local nn=ref:getBlock("n",4) - tab[ind]=loadstring(ref:read(nn)) - n=n+4+nn - elseif dt=="T" then - local cur=ref:getSeek() - local size=ref:getBlock("n",4) - ref:setSeek(cur) - ref:read(4) - if size==7 then - tab[ind]={} - ref:read(7) - n=n+11 - else - local data=bin.new(ref:read(size)) - local dat=data:getBlock("t") - if dat.__RECURSIVE then - tab[ind]=tab - else - tab[ind]=dat - end - n=n+data:getSize()+4 - end - end - if n==len then break end - end - return bin.resolveType(tab) -end,function(d,fit,fmt,self,rec,tabsaw) - -- INGORE FIT WE ARE CREATING A STRUCT!!! - -- fmt will apply to all numbers - local __rem=nil - if not tabsaw then rem=true end - local tabsaw=tabsaw or {} - if rem then - table.insert(tabsaw,d) - end - local bData={} - for i,v in pairs(d) do -- this is for tables, all but userdata is fine. Depending on where you are using lua functions may or may not work - local tp=type(v):sub(1,1):upper() -- uppercase of datatype - if type(i)=="number" then -- Lets handle indexies - if v==math.huge then - tp="I" - v=0 - elseif v==-math.huge then - tp="i" - v=0 - end - table.insert(bData,"N"..tp..bin.defualtBit.numToBytes(i,4)) -- number index? - elseif type(i)=="string" then - if #i>255 then error("A string index cannot be larger than 255 bytes!") end - table.insert(bData,"S"..tp..bin.defualtBit.numToBytes(#i,1)..i) -- string index? - else - error("Only numbers and strings can be a table index!") -- throw error? - end - if type(v)=="number" then - -- How do we handle number data - local temp=bin.new() - temp:addBlock(v,nil,"d") - table.insert(bData,temp.data) - elseif type(v)=="string" then - -- Lets work on strings - table.insert(bData,bin.defualtBit.numToBytes(#v,4)) -- add length of string - table.insert(bData,v) -- add string - elseif type(v)=="boolean" then -- bools are easy :D - table.insert(bData,({[true]="\255",[false]="\0"})[v]) - elseif type(v)=="function" then -- should we allow this? why not... - local dump=string.dump(v) - table.insert(bData,bin.defualtBit.numToBytes(#dump,4)) -- add length of dumped string - table.insert(bData,dump) -- add it - elseif type(v)=="table" then -- tables... - if tabsaw[1]==v then - v={__RECURSIVE=i} - else - tabsaw[i]=v - end - local data=rec(v,nil,"t",self,rec,tabsaw) - table.insert(bData,bin.defualtBit.numToBytes(#data,4)) -- add length of string - table.insert(bData,data) -- add string - end - end - local data=table.concat(bData) - return "LT"..string.char(__CURRENTVERSION)..bin.defualtBit.numToBytes(#data,4)..data -end) -bin.registerBlock("b",function(SIZE_OR_NIL,ref) - return ({["\255"]=true,["\0"]=false})[ref:read(1)] -end,function(d) - return ({[true]="\255",[false]="\0"})[d] -end) -bin.registerBlock("f",function(SIZE_OR_NIL,ref) - local nn=ref:getBlock("n",4) - return loadstring(ref:read(nn)) -end,function(d) - local dump=string.dump(d) - return bin.defualtBit.numToBytes(#dump,4)..dump -end) -bin.registerBlock("d",function(SIZE_OR_NIL,ref) - local w,p=ref:getBlock("n",4),ref:getBlock("n",4) - p=tonumber("0."..tostring(p)) - return w+p -end,function(d,fit,fmt,self,rec,tabsaw) - local w,p = toFraction(d) - local temp=bin.new() - temp:addBlock(w,4) - temp:addBlock(p,4) - return temp.data -end) \ No newline at end of file diff --git a/examples/love2d Threading Example/bin/support/utils.lua b/examples/love2d Threading Example/bin/support/utils.lua deleted file mode 100644 index cc6efa6..0000000 --- a/examples/love2d Threading Example/bin/support/utils.lua +++ /dev/null @@ -1,127 +0,0 @@ -function table.print(tbl, indent) - if not indent then indent = 0 end - for k, v in pairs(tbl) do - formatting = string.rep(" ", indent) .. k .. ": " - if type(v) == "table" then - print(formatting) - table.print(v, indent+1) - elseif type(v) == 'boolean' then - print(formatting .. tostring(v)) - else - print(formatting .. tostring(v)) - end - end -end -function table.flip(t) - local tt={} - for i,v in pairs(t) do - tt[v]=i - end - return tt -end -function toFraction(n) - local w,p=math.modf(n) - if p~=0 then - p=tonumber(tostring(p):sub(3)) - end - return w,p -end -function io.cleanName(name) - name=name:gsub("\\","") - name=name:gsub("/","") - name=name:gsub(":","") - name=name:gsub("*","") - name=name:gsub("%?","") - name=name:gsub("\"","''") - name=name:gsub("<","") - name=name:gsub(">","") - name=name:gsub("|","") - return name -end -function math.numfix(n,x) - local str=tostring(n) - if #strx+w or mxy+h or myx+w or mxy+h or my self.x and x < self.x+self.width and y > self.y and y < self.y+self.height and self:TClickable(x,y) and self:eventable()) - end - end - self.id=-1 -end -multi:newTask(function() -- A bit of post-loading haha - gui.touchpressed=multi:newConnection() - gui.touchreleased=multi:newConnection() - gui.touchmoved=multi:newConnection() - love.touchpressed=Library.convert(love.touchpressed or function() end) - love.touchreleased=Library.convert(love.touchreleased or function() end) - love.touchmoved=Library.convert(love.touchmoved or function() end) - love.touchpressed:inject(function(id, x, y, dx, dy, pressure) gui.touchpressed:Fire(id, x, y, dx, dy, pressure) return {id, x, y, dx, dy, pressure} end,1) - love.touchreleased:inject(function(id, x, y, dx, dy, pressure) gui.touchreleased:Fire(id, x, y, dx, dy, pressure) return {id, x, y, dx, dy, pressure} end,1) - love.touchmoved:inject(function(id, x, y, dx, dy, pressure) gui.touchmoved:Fire(id, x, y, dx, dy, pressure) return {id, x, y, dx, dy, pressure} end,1) - _GuiPro.TouchReady=true - _GuiPro.TouchRegister={} - gui.touchpressed:connect(function(id, x, y, dx, dy, pressure) - for i,v in pairs(_GuiPro.TouchRegister) do - if #v.tid==0 then - if (x > v.x and x < v.x+v.width and y > v.y and y < v.y+v.height and v:TClickable(x,y) and v:eventable()) then - v:addTID(id) - v.touchcount=1 - for i=1,#v.ToFuncP do - v.ToFuncP[i](v,id, x-v.x, y-v.y, dx, dy or 0, pressure or 1) - end - end - elseif not(v:hasTID(id)) then - if (x > v.x and x < v.x+v.width and y > v.y and y < v.y+v.height and v:TClickable(x,y) and v:eventable()) then - v:addTID(id) - v.touchcount=v.touchcount+1 - for i=1,#v.ToFuncP do - v.ToFuncP[i](v,id, x-v.x, y-v.y, dx, dy or 0, pressure or 1) - end - end - end - end - end) - gui.touchreleased:connect(function(id, x, y, dx, dy, pressure) - for i,v in pairs(_GuiPro.TouchRegister) do - if v:hasTID(id) then - v:removeTID(id) - for i=1,#v.ToFuncR do - v.ToFuncR[i](v,id, x-v.x, y-v.y, dx, dy or 0, pressure or 1) - end - end - end - end) - gui.touchmoved:connect(function(id, x, y, dx, dy, pressure) - for i,v in pairs(_GuiPro.TouchRegister) do - if v:hasTID(id) and (x > v.x and x < v.x+v.width and y > v.y and y < v.y+v.height and v:TClickable(x,y) and v:eventable()) then - for i=1,#v.ToFuncM do - v.ToFuncM[i](v,id, x-v.x, y-v.y, dx, dy or 0, pressure or 1) - end - elseif v:hasTID(id) and not((x > v.x and x < v.x+v.width and y > v.y and y < v.y+v.height and v:TClickable(x,y) and v:eventable())) then - v:removeTID(id) - for i=1,#v.ToFuncR do - v.ToFuncR[i](v,id, x-v.x, y-v.y, dx, dy or 0, pressure or 1) - end - end - end - end) -end) --- now that that is done lets set up some more post loading checks -_GuiPro.int=multi:newProcess() -_GuiPro.int:Start() -_GuiPro.int:setJobSpeed(.001) -_GuiPro.EXACT=0 -_GuiPro.LAX=.01 -_GuiPro.LAZY=.05 --- now lets define the reg function -function gui.Compare(a,b,v,tp) - if tp==">" then - if (a+v>b or a-v>b) then - return true - end - elseif tp=="<" then - if (a+v=" then - if (a+v>=b or a-v>=b) then - return true - end - elseif tp=="==" then -- this one is gonna be tricky - if (a>=b-v and a<=b+v) or (b>=a-v and b<=a+v) then - return true - end - end - return false -end -function gui:regesterTouch() - local obj=self - obj.ToFuncP={} - obj.ToFuncM={} - obj.ToFuncR={} - obj.To2Func={} - obj.ToDTFunc={} - obj.touchRendering =_GuiPro.EXACT -- exact(0), lax(), # - function obj:removeTID(id) - for i=1,#self.tid do - if self.tid[i]==id then - table.remove(self.tid,i) - self.touchcount=self.touchcount-1 - return - end - end - end - function obj:hasTID(id) - for i=1,#self.tid do - if self.tid[i]==id then - return true - end - end - return false - end - obj.txl1=0 - obj.tyl1=0 - obj.txl2=0 - obj.tyl2=0 - obj.LS=0 - obj:OnUpdate(function(self) - if self.touchcount==2 then - local x1,y1=love.touch.getPosition( self.tid[1] ) - local x2,y2=love.touch.getPosition( self.tid[2] ) - local CS=math.sqrt((x2-x1)^2+(y2-y1)^2) - if gui.Compare(CS,self.LS,self.touchRendering,">") then - for i=1,#self.To2Func do - self.To2Func[i](self,CS,x1-self.x,y1-self.y,x2-self.x,y2-self.y) - end - elseif gui.Compare(CS,self.LS,self.touchRendering,"<") then - for i=1,#self.To2Func do - self.To2Func[i](self,-CS,x1-self.x,y1-self.y,x2-self.x,y2-self.y) - end - elseif gui.Compare(CS,self.LS,self.touchRendering,"==") then - for i=1,#self.To2Func do - self.To2Func[i](self,0,x1-self.x,y1-self.y,x2-self.x,y2-self.y) - end - end - -- if self.txl1~=x1 or self.txl2~=x2 or self.tyl1~=y1 or self.tyl2~=y2 then - -- for i=1,#self.To2Func do - -- self.To2Func[i](self,0,x1-self.x,y1-self.y,x2-self.x,y2-self.y) - -- end - -- end - self.LS=CS - self.txl1=x1 - self.txl2=x2 - self.tyl1=y1 - self.tyl2=y2 - end - end) - function obj:OnDoubleTap(func) - table.insert(self.ToDTFunc,func) - end - function obj:On2TouchMoved(func) - table.insert(self.To2Func,func) - end - function obj:addTID(id) - table.insert(self.tid,id) - end - function obj:OnTouchPressed(func) - table.insert(self.ToFuncP,func) -- event for touches - end - function obj:OnTouchReleased(func) -- event for touches - table.insert(self.ToFuncR,func) - end - function obj:OnTouchMoved(func) -- event for touches - table.insert(self.ToFuncM,func) - end - if _GuiPro.TouchReady then -- my sneaky test - print("Registred: "..tostring(obj)) - table.insert(_GuiPro.TouchRegister,obj) - else - print("Attempting to register: "..tostring(obj)) - _GuiPro.int:newJob(function() table.insert(_GuiPro.TouchRegister,obj) end) -- a sneaky way to ensure that your object gets registered eventually, even if you call the method before the touch patch was activated. - end -end - -function UpdateThings(items) - for i=#items,1,-1 do - if items[i]:LClicked() then - for g=1,#items[i].funcs do - items[i].funcs[g]("l",items[i],love.mouse.getX()-items[i].x,love.mouse.getY()-items[i].y) - end - elseif items[i]:RClicked() then - for g=1,#items[i].funcs do - items[i].funcs[g]("r",items[i],love.mouse.getX()-items[i].x,love.mouse.getY()-items[i].y) - end - elseif items[i]:MClicked() then - for g=1,#items[i].funcs do - items[i].funcs[g]("m",items[i],love.mouse.getX()-items[i].x,love.mouse.getY()-items[i].y) - end - end - if not(items[i]:LClicked()) and items[i].LRE then - for g=1,#items[i].funcs2 do - items[i].funcs2[g]("l",items[i],love.mouse.getX()-items[i].x,love.mouse.getY()-items[i].y) - end - elseif not(items[i]:RClicked()) and items[i].RRE then - for g=1,#items[i].funcs2 do - items[i].funcs2[g]("r",items[i],love.mouse.getX()-items[i].x,love.mouse.getY()-items[i].y) - end - elseif not(items[i]:MClicked()) and items[i].MRE then - for g=1,#items[i].funcs2 do - items[i].funcs2[g]("m",items[i],love.mouse.getX()-items[i].x,love.mouse.getY()-items[i].y) - end - end - if items[i]:Hovering() and items[i].HE==false then - for g=1,#items[i].funcs3 do - items[i].funcs3[g](items[i],love.mouse.getX()-items[i].x,love.mouse.getY()-items[i].y) - end - elseif not(items[i]:Hovering()) and items[i].HE==true then - for g=1,#items[i].funcs4 do - items[i].funcs4[g](items[i],love.mouse.getX()-items[i].x,love.mouse.getY()-items[i].y) - end - elseif items[i]:Hovering() then - for g=1,#items[i].func9 do - items[i].func9[g](items[i],love.mouse.getX()-items[i].x,love.mouse.getY()-items[i].y) - end - end - for g=1,#items[i].funcs5 do - items[i].funcs5[g](items[i]) - end - end -end -function GetAllChildren(Object) - local Stuff = {} - function Seek(Items) - for i=1,#Items do - if Items[i].Visible==true then - table.insert(Stuff,Items[i]) - local NItems = Items[i]:getChildren() - if NItems ~= nil then - Seek(NItems) - end - end - end - end - local Objs = Object:getChildren() - for i=1,#Objs do - if Objs[i].Visible==true then - table.insert(Stuff,Objs[i]) - local Items = Objs[i]:getChildren() - if Items ~= nil then - Seek(Items) - end - end - end - return Stuff -end -function GetAllChildren2(Object) - local Stuff = {} - function Seek(Items) - for i=1,#Items do - table.insert(Stuff,Items[i]) - local NItems = Items[i]:getChildren() - if NItems ~= nil then - Seek(NItems) - end - end - end - local Objs = Object:getChildren() - for i=1,#Objs do - table.insert(Stuff,Objs[i]) - local Items = Objs[i]:getChildren() - if Items ~= nil then - Seek(Items) - end - end - return Stuff -end -function gui:getTile(i,x,y,w,h)-- returns imagedata - if type(i)=="string" then - i=love.graphics.newImage(i) - elseif type(i)=="userdata" then - -- do nothing - elseif string.find(self.Type,"Image",1,true) then - local i,x,y,w,h=self.Image,i,x,y,w - else - error("getTile invalid args!!! Usage: ImageElement:getTile(x,y,w,h) or gui:getTile(imagedata,x,y,w,h)") - end - local iw,ih=i:getDimensions() - local id,_id=i:getData(),love.image.newImageData(w,h) - for _x=x,w+x-1 do - for _y=y,h+y-1 do - -- - _id:setPixel(_x-x,_y-y,id:getPixel(_x,_y)) - end - end - return love.graphics.newImage(_id) -end -function gui:newAnim(file,delay, x, y, w, h, sx ,sy ,sw ,sh) - local x,y,w,h,sx,sy,sw,sh=filter(file, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("ImageAnimation",file, x, y, w, h, sx ,sy ,sw ,sh) - c.Visibility=0 - c.ImageVisibility=1 - c.delay=delay or .05 - c.files={} - c.AnimStart={} - c.AnimEnd={} - local _files=alphanumsort(love.filesystem.getDirectoryItems(file)) - for i=1,#_files do - if string.sub(_files[i],-1,-1)~="b" then - table.insert(c.files,love.graphics.newImage(file.."/".._files[i])) - end - end - c.step=multi:newTStep(1,#c.files,1,c.delay) - c.step.parent=c - c.rotation=0 - c.step:OnStart(function(step) - for i=1,#step.parent.AnimStart do - step.parent.AnimStart[i](step.parent) - end - end) - c.step:OnStep(function(pos,step) - step.parent:SetImage(step.parent.files[pos]) - end) - c.step:OnEnd(function(step) - for i=1,#step.parent.AnimEnd do - step.parent.AnimEnd[i](step.parent) - end - end) - function c:OnAnimStart(func) - table.insert(self.AnimStart,func) - end - function c:OnAnimEnd(func) - table.insert(self.AnimEnd,func) - end - function c:Pause() - self.step:Pause() - end - function c:Resume() - self.step:Resume() - end - function c:Reset() - self.step.pos=1 - end - function c:getFrames() - return #self.files - end - function c:getFrame() - return self.step.pos - end - function c:setFrame(n) - return self:SetImage(self.files[n]) - end - return c -end -function gui:newAnimFromData(data,delay, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("ImageAnimation","FromFile", x, y, w, h, sx ,sy ,sw ,sh) - c.Visibility=0 - c.ImageVisibility=1 - c.delay=delay or .05 - c.files=data - c.AnimStart={} - c.AnimEnd={} - c:SetImage(c.files[1]) - c.step=multi:newTStep(1,#c.files,1,c.delay) - c.step.parent=c - c.rotation=0 - c.step:OnStart(function(step) - for i=1,#step.parent.AnimStart do - step.parent.AnimStart[i](step.parent) - end - end) - c.step:OnStep(function(pos,step) - step.parent:SetImage(step.parent.files[pos]) - end) - c.step:OnEnd(function(step) - for i=1,#step.parent.AnimEnd do - step.parent.AnimEnd[i](step.parent) - end - end) - function c:OnAnimStart(func) - table.insert(self.AnimStart,func) - end - function c:OnAnimEnd(func) - table.insert(self.AnimEnd,func) - end - function c:Pause() - self.step:Pause() - end - function c:Resume() - self.step:Resume() - end - function c:Reset() - self.step.pos=1 - end - function c:getFrames() - return #self.files - end - function c:getFrame() - return self.step.pos - end - function c:setFrame(n) - return self:SetImage(self.files[n]) - end - return c -end -function gui:newAnimFromTiles(file,xd,yd,delay, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(file, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("ImageAnimation",file, x, y, w, h, sx ,sy ,sw ,sh) - local im=love.graphics.newImage(file) - local _x,_y=im:getDimensions() - c.Visibility=0 - c.ImageVisibility=1 - c.delay=delay or .05 - c.files={} - c.AnimStart={} - c.AnimEnd={} - for i=0,_y/yd-1 do - for j=0,_x/xd-1 do - table.insert(c.files,gui:getTile(im,j*xd,i*yd,xd,yd)) - end - end - c:SetImage(c.files[1]) - c.step=multi:newTStep(1,#c.files,1,c.delay) - c.step.parent=c - c.rotation=0 - c.step:OnStart(function(step) - for i=1,#step.parent.AnimStart do - step.parent.AnimStart[i](step.parent) - end - end) - c.step:OnStep(function(pos,step) - step.parent:SetImage(step.parent.files[pos]) - end) - c.step:OnEnd(function(step) - for i=1,#step.parent.AnimEnd do - step.parent.AnimEnd[i](step.parent) - end - end) - function c:OnAnimStart(func) - table.insert(self.AnimStart,func) - end - function c:OnAnimEnd(func) - table.insert(self.AnimEnd,func) - end - function c:Pause() - self.step:Pause() - end - function c:Resume() - self.step:Resume() - end - function c:Reset() - self.step.pos=1 - end - function c:getFrames() - return #self.files - end - function c:getFrame() - return self.step.pos - end - function c:setFrame(n) - return self:SetImage(self.files[n]) - end - return c -end -function gui:newFullImageLabel(i,name) - return self:newImageLabel(i,name,0,0,0,0,0,0,1,1) -end -function gui:newImageButton(i,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("ImageButton",name, x, y, w, h, sx ,sy ,sw ,sh) - if type(i)=="string" then - c.Image=love.graphics.newImage(i) - else - c.Image=i - end - c.Visibility=0 - c.ImageVisibility=1 - c.rotation=0 - if c.Image~=nil then - c.ImageHeigth=c.Image:getHeight() - c.ImageHeight=c.Image:getHeight() - c.ImageWidth=c.Image:getWidth() - c.Quad=love.graphics.newQuad(0,0,w,h,c.ImageWidth,c.ImageHeigth) - end - c:OnEnter(function() - --love.mouse.setCursor(_GuiPro.CursorH) - end) - c:OnExit(function() - --love.mouse.setCursor(_GuiPro.CursorN) - end) - return c -end -function gui:newImageLabel(i,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("ImageLabel",name, x, y, w, h, sx ,sy ,sw ,sh) - if type(i)=="string" then - c.Image=love.graphics.newImage(i) - else - c.Image=i - end - c.Visibility=0 - c.ImageVisibility=1 - c.rotation=0 - if c.Image~=nil then - c.ImageHeigth=c.Image:getHeight() - c.ImageWidth=c.Image:getWidth() - c.Quad=love.graphics.newQuad(0,0,w,h,c.ImageWidth,c.ImageHeigth) - end - return c -end -function gui:newVideo(name,i,x,y,w,h,sx,sy,sw,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("Video",name, x, y, w, h, sx ,sy ,sw ,sh) - if type(i)=="string" then - c.Video=love.graphics.newVideo(i) - else - c.Video=i - end - c.Visibility=0 - c.VideoVisibility=1 - c.rotation=0 - if c.Video~=nil then - c.VideoHeigth=c.Video:getHeight() - c.VideoWidth=c.Video:getWidth() - c.Quad=love.graphics.newQuad(0,0,w,h,c.VideoWidth,c.VideoHeigth) - end - c.funcV={} - function c:Play() - self.handStart=true - self.Video:play() - end - function c:Pause() - self.Video:pause() - end - c.Resume=c.Play - function c:Stop() - self.handStart=false - self:Pause() - self:Rewind() - for i=1,# self.funcV do - self.funcV[i](self) - end - end - function c:OnVideoStopped(func) - table.insert(self.funcV,func) - end - function c:Rewind() - self.Video:rewind() - end - function c:Restart() - self:Rewind() - self:Play() - end - function c:Seek(o) - self.Video:seek(o) - end - function c:Tell() - self.Video:tell() - end - function c:SetFilter(min, mag, anisotropy) - self.Video:setFilter(min, mag, anisotropy) - end - function c:IsPlaying() - return self.Video:isPlaying() - end - c:OnUpdate(function(self) - if self.Video:isPlaying()==false and self.handStart == true then - self:Stop() - end - end) - return c -end -function gui:SetImage(i) - if type(i)=="string" then - self.Image=love.graphics.newImage(i) - else - self.Image=i - end - if self.Image~=nil then - self.ImageHeigth=self.Image:getHeight() - self.ImageWidth=self.Image:getWidth() - self.Quad=love.graphics.newQuad(0,0,self.width,self.height,self.ImageWidth,self.ImageHeigth) - end - return self.ImageWidth,self.ImageHeigth -end -function gui:UpdateImage() - self.ImageHeigth=self.Image:getHeight() - self.ImageWidth=self.Image:getWidth() - self.Quad=love.graphics.newQuad(0,0,self.width,self.height,self.ImageWidth,self.ImageHeigth) -end -function gui:newDropFrame(name,x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("DropFrame",name, x, y, w, h, sx ,sy ,sw ,sh) - c.WasBeingDragged=false - c.IsBeingDragged=false - c.Draggable=false - c.funcD={} - function c:GetDroppedItems() - local t=self:getChildren() - local tab={} - for i=1,#t do - if t[i].Type=="TextImageButtonFrameDrag" then - table.insert(tab,t[i]) - end - end - return tab - end - function c:OnDropped(func) - table.insert(self.funcD,func) - end - c:OnUpdate(function(self) - if _GuiPro.DragItem then - if _GuiPro.DragItem.Type=="TextImageButtonFrameDrag" and love.mouse.isDown(_GuiPro.DragItem.dragbut or "m")==false and self:IsHovering() then - local t=_GuiPro.DragItem - _GuiPro.DragItem={} - for i=1,#t.funcD do - t.funcD[i](self,t) - end - for i=1,#self.funcD do - self.funcD[i](self,t) - end - _GuiPro.hasDrag=false - end - end - end) - return c -end -function gui:newFrame(name,x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("Frame",name, x, y, w, h, sx ,sy ,sw ,sh) - c.WasBeingDragged=false - c.IsBeingDragged=false - c.Draggable=false - return c -end -function gui:newFullFrame(name) - name=name or "" - return self:newFrame(name,0,0,0,0,0,0,1,1) -end - -function gui:newTabFrame(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=gui:newFrame(name, x, y, w, h, sx ,sy ,sw ,sh) - c.tabheight=20 - c.Holder=c:newFrame("Holder",0,c.tabheight,0,0,0,0,1,1) - c.TabHolder=c:newFrame("TabHolder",0,0,0,c.tabheight,0,0,1) - function c:setTabHeight(n) - self.tabheight=n - self.Holder:SetDualDim(0,-self.tabheight,0,0,0,0,1,1) - end - function c:addTab(name,colorT,colorH) - if colorT and not(colorH) then - colorH=colorT - end - local tab=self.TabHolder:newTextButton(name,name,0,0,0,0,0,0,0,1) - tab.Tween=-3 - if colorT then - tab.Color=colorT - end - local holder=self.Holder:newFrame(name,0,0,0,0,0,0,1,1) - if colorH then - holder.Color=colorH - end - tab.frame=holder - tab:OnReleased(function(b,self) - if b=="l" then - local tt=self.Parent:getChildren() - local th=self.Parent.Parent.Holder:getChildren() - for i=1,#th do - th[i].Visible=false - end - for i=1,#tt do - tt[i].frame.Visible=false - tt[i].BorderSize=1 - end - self.BorderSize=0 - self.frame.Visible=true - end - end) - local tt=self.TabHolder:getChildren() - for i=1,#tt do - tt[i].frame.Visible=false - tt[i].BorderSize=1 - end - tab.frame.Visible=true - tab.BorderSize=0 - return tab,holder - end - c:OnUpdate(function(self) - local th=self.TabHolder:getChildren() - local l=self.width/#th - for i=1,#th do - th[i]:SetDualDim(l*(i-1),0,l) - end - if #th==0 then - self:Destroy() - end - end) - return c -end -function gui:newDragItem(t,i,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("TextImageButtonFrameDrag",name, x, y, w, h, sx ,sy ,sw ,sh) - c.WasBeingDragged=false - c.IsBeingDragged=false - c.Draggable=true - c.funcD={} - if type(i)=="string" then - c.Image=love.graphics.newImage(i) - c.ImageVisibility=1 - c.ImageHeigth=c.Image:getHeight() - c.ImageWidth=c.Image:getWidth() - c.Quad=love.graphics.newQuad(0,0,w,h,c.ImageWidth,c.ImageHeigth) - elseif type(i)=="image" then - c.Image=i - c.ImageVisibility=1 - c.ImageHeigth=c.Image:getHeight() - c.ImageWidth=c.Image:getWidth() - c.Quad=love.graphics.newQuad(0,0,w,h,c.ImageWidth,c.ImageHeigth) - end - c:OnDragStart(function(self,x,y) - if _GuiPro.hasDrag==false then - self:setParent(_GuiPro) - self:SetDualDim(x,y) - self:TopStack() - end - end) - c.rotation=0 - c.Tween=0 - c.XTween=0 - c.text = t - c.AutoScaleText=false - c.FontHeight=_defaultfont:getHeight() - c.Font=_defaultfont - c.FontSize=15 - c.TextFormat="center" - c.TextVisibility=1 - c.TextColor = {0, 0, 0} - function c:OnDropped(func) - table.insert(self.funcD,func) - end - c:OnUpdate(function(self) - if love.mouse.isDown("m" or self.dragbut)==false and self==_GuiPro.DragItem and self.hovering==false then - _GuiPro.DragItem={} - for i=1,#self.func7 do - self.func7[i](self,(love.mouse.getX())-self.width/2,(love.mouse.getY())-self.height/2) - end - end - end) - return c -end -function gui:newItem(t,i,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("TextImageButtonFrame",name, x, y, w, h, sx ,sy ,sw ,sh) - if type(i)=="string" then - c.Image=love.graphics.newImage(i) - else - c.Image=i - end - c.rotation=0 - c.ImageVisibility=1 - c.Draggable=false - if c.Image~=nil then - c.ImageHeigth=c.Image:getHeight() - c.ImageWidth=c.Image:getWidth() - c.Quad=love.graphics.newQuad(0,0,w,h,c.ImageWidth,c.ImageHeigth) - end - c.Tween=0 - c.XTween=0 - c.text = t - c.AutoScaleText=false - c.FontHeight=_defaultfont:getHeight() - c.Font=_defaultfont - c.FontSize=15 - c.TextFormat="center" - c.TextVisibility=1 -- 0=invisible,1=solid (self.TextVisibility*254+1) - c.TextColor = {0, 0, 0} - return c -end -function gui:addDominance() - _GuiPro.TopHovered=self -end -function gui:addHotKey(key) - local temp=self:newFrame(0,0,0,0) - temp.Visible=false - temp:setHotKey(key) - return temp -end -function gui:AdvTextBox(txt,x,y,w,h,sx,sy,sw,sh) - name="AdvTextBox" - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("AdvTextBoxFrame",name, x, y, w, 30, sx ,sy ,sw ,sh) - c.Draggable=true - c.dragbut="r" - c.BorderSize=0 - c:ApplyGradient{Color.Blue,Color.sexy_purple} - c:newTextLabel(txt,"Holder",0,0,0,h-30,0,1,1,0).Color=Color.sexy_purple - c.funcO={} - c.funcX={} - c:OnDragStart(function(self) - self:TopStack() - end) - --local temp = c:newTextButton("X","Close",-25,5,20,20,1) - --temp.Tween=-5 - --temp.XTween=-2 - --temp:OnReleased(function(b,self) for i=1,#self.Parent.funcX do self.Parent.funcX[i](self.Parent) end end) - --temp.Color=Color.Red - c.tLink=c:newTextBox("puttext","TextBox",5,h-95,-40,30,0,1,1,1) - c.tLink.Color=Color.light_gray - c.tLink.ClearOnFocus=true - c.tLink:OnFocus(function(self) self.ClearOnFocus=false end) - local temp=c:newTextButton("OK","Ok",-35,h-65,30,30,1,1) - temp:OnReleased(function(b,self) for i=1,#self.Parent.funcO do self.Parent.funcO[i](self.Parent,self.Parent.tLink.text) end end) - temp.Color=Color.Green - temp.XTween=-2 - local temp=c:newTextButton("X","Cancel",-35,h-95,30,30,1,1) - temp:OnReleased(function(b,self) for i=1,#self.Parent.funcX do self.Parent.funcX[i](self.Parent,self.Parent.tLink.text) end end) - temp.Color=Color.Red - temp.XTween=-2 - function c:Close() - self.Visible=false - end - function c:Open() - self.Visible=true - end - function c:OnOk(func) - table.insert(self.funcO,func) - end - function c:OnX(func) - table.insert(self.funcX,func) - end - return c -end -function alphanumsort(o) - local function padnum(d) local dec, n = string.match(d, "(%.?)0*(.+)") - return #dec > 0 and ("%.12f"):format(d) or ("%s%03d%s"):format(dec, #n, n) - end - table.sort(o, function(a,b) return tostring(a):gsub("%.?%d+",padnum)..("%3d"):format(#b)< tostring(b):gsub("%.?%d+",padnum)..("%3d"):format(#a) end) - return o -end -function gui:anchorRight(n) - self:SetDualDim(-(self.width+n),nil,nil,nil,1) -end -function _GuiPro.gradient(colors) - local direction = colors.direction or "horizontal" - colors.direction=nil - trans = colors.trans or 255 - trans=math.floor(trans) - if direction == "horizontal" then - direction = true - elseif direction == "vertical" then - direction = false - else - error("Invalid direction '" .. tostring(direction) "' for gradient. Horizontal or vertical expected.") - end - local result = love.image.newImageData(direction and 1 or #colors, direction and #colors or 1) - for __i, color in ipairs(colors) do - local x, y - if direction then - x, y = 0, __i - 1 - else - x, y = __i - 1, 0 - end - result:setPixel(x, y, color[1], color[2], color[3], trans) - end - result = love.graphics.newImage(result) - result:setFilter('linear', 'linear') - return result -end -function _GuiPro.drawinrect(img, x, y, w, h, r, ox, oy, kx, ky) - love.graphics.draw(img, x, y, r, w / img:getWidth(), h / img:getHeight(), ox, oy, kx, ky) -end -function gui:ApplyGradient(rules) - self.Image=nil - self.Type=self.Type.."w/GradImage" - self.rotation=0 - self.ImageVisibility=rules.visibility or 1 - self:SetImage(_GuiPro.gradient(rules)) -end -function gui:BottomStack() - childs=self.Parent:getChildren() - for i=1,#childs do - if childs[i]==self then - table.remove(self.Parent.Children,i) - table.insert(self.Parent.Children,1,self) - break - end - end -end -function gui:Center() - local x,y=self:getFullSize() - self:SetDualDim(-math.floor(x/2),-math.floor(y/2),nil,nil,.5,.5) -end -function gui:centerX() - self:SetDualDim(-(self.width/2),nil,nil,nil,.5) -end -function gui:centerY() - self:SetDualDim(nil,-(self.height/2),nil,nil,nil,.5) -end -function gui:Destroy() - check=self.Parent:getChildren() - local cc=0 - for cc=1,#check do - if check[cc]==self then - table.remove(self.Parent.Children,cc) - end - end -end -function gui:disrespectHierarchy() - _GuiPro.Hierarchy=false -end -function gui:GetAllChildren() - local Stuff = {} - function Seek(Items) - for i=1,#Items do - if Items[i].Visible==true then - table.insert(Stuff,Items[i]) - local NItems = Items[i]:getChildren() - if NItems ~= nil then - Seek(NItems) - end - end - end - end - local Objs = self:getChildren() - for i=1,#Objs do - if Objs[i].Visible==true then - table.insert(Stuff,Objs[i]) - local Items = Objs[i]:getChildren() - if Items ~= nil then - Seek(Items) - end - end - end - return Stuff -end -function gui:GetChild(name) - return self.Children[name] or self -end -function gui:getChildren() - return self.Children -end -function gui:getColor(cindex) - return Color[cindex] -end -function gui:getFullSize() - local maxx,maxy=-math.huge,-math.huge - local temp = self:GetAllChildren() - for i=1,#temp do - if temp[i].width>maxx then - maxx=temp[i].width+temp[i].offset.pos.x - elseif temp[i].height>maxy then - maxy=temp[i].height+temp[i].offset.pos.y - end - end - return maxx,maxy -end -function gui:getHighest() - if self.Children[#self.Children]~=nil then - return self.Children[#self.Children] - end -end -function gui:getLowest() - if self.Children[1]~=nil then - return self.Children[1] - end -end -function InGrid(i,x,y,s) - return math.floor((i-1)/x)*s,(i-1)*s-(math.floor((i-1)/y)*(s*x)) -end -function InGridX(i,w,h,xs,ys) - local xc,yc=math.floor(w/xs),math.floor(h/ys) - local xi,yi=(i-1)%xc,math.floor((i-1)/xc) - return xi*xs,yi*ys -end -function InGridY(i,w,h,xs,ys) - local xc,yc=math.floor(w/xs),math.floor(h/ys) - local xi,yi=math.floor((i-1)/yc),(i-1)%yc - return xi*xs,yi*ys -end -function gui:isDescendant(obj) - local things=obj:GetAllChildren() - for i=1,#things do - if things[i]==self then - return true - end - end - return false -end -function gui:isHighest() - return (self==self.Parent:getHighest()) -end -function gui:IsHovering() - return (love.mouse.getX() > self.x and love.mouse.getX() < self.x+self.width and love.mouse.getY() > self.y and love.mouse.getY() < self.y+self.height) -end -function gui:isLowest() - return (self==self.Parent:getLowest()) -end -function gui.massMutate(t,...) - local mut={...} - for i=1,#mut do - mut[i]:Mutate(t) - end -end -function gui:Move(x,y) - self.offset.pos.x=self.offset.pos.x+x - self.offset.pos.y=self.offset.pos.y+y -end -if love.filesystem.exists("CheckBoxes.png") then - _GuiPro.UC=gui:getTile("CheckBoxes.png",0,0,16,16) - _GuiPro.C=gui:getTile("CheckBoxes.png",16,0,16,16) - _GuiPro.UCH=gui:getTile("CheckBoxes.png",0,16,16,16) - _GuiPro.CH=gui:getTile("CheckBoxes.png",16,16,16,16) -end -function gui:newCheckBox(name,x,y) - if not(_GuiPro.UC) then error("CheckBoxes.png not found! Cannot currently use checkbox without the data") end - if type(name)~="String" then - x,y,name=name,x,"CheckBox" - end - local c=self:newImageLabel(_GuiPro.UC,name, x, y, 16,16) - c.Visibility=0 - c.check=false - c:OnEnter(function(self) - if self.check then - self:SetImage(_GuiPro.CH) - else - self:SetImage(_GuiPro.UCH) - end - end) - function c:isChecked() - return self.check - end - c:OnExit(function(self) - if self.check then - self:SetImage(_GuiPro.C) - else - self:SetImage(_GuiPro.UC) - end - end) - c:OnReleased(function(b,self) - self.check=not(self.check) - if self.check then - self:SetImage(_GuiPro.CH) - else - self:SetImage(_GuiPro.UCH) - end - end) - return c -end -function gui:newMessageBox(txt,x,y,w,h,sx,sy,sw,sh) - name="MessageBox" - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("MessageBoxFrame",name, x, y, w, 30, sx ,sy ,sw ,sh) - c.Draggable=true - c.dragbut="r" - c:ApplyGradient{Color.Blue,Color.sexy_purple} - c.BorderSize=0 - c:newTextLabel(txt,"Holder",0,0,0,h-30,0,1,1,0).Color=Color.sexy_purple - c.funcO={} - c.funcX={} - c:OnDragStart(function(self) - self:TopStack() - end) - local temp = c:newTextButton("X","Close",-25,5,20,20,1) - temp.Tween=-5 - temp.XTween=-2 - temp:OnReleased(function(b,self) for i=1,#self.Parent.funcX do self.Parent.funcX[i](self.Parent) end end) - temp.Color=Color.Red - local temp=c:newTextButton("OK","Ok",0,h-65,0,30,.25,1,.5) - temp:OnReleased(function(b,self) for i=1,#self.Parent.funcO do self.Parent.funcO[i](self.Parent) end end) - temp.Color=Color.Green - function c:Close() - self.Visible=false - end - function c:Open() - self.Visible=true - end - function c:OnOk(func) - table.insert(self.funcO,func) - end - function c:OnX(func) - table.insert(self.funcX,func) - end - return c -end -function gui:newPart(x, y,w ,h , sx ,sy ,sw ,sh) - local c = {} - setmetatable(c, gui) - if self==gui then - c.Parent=_GuiPro - else - c.Parent=self - end - c.funcs={} - c.funcs2={} - c.funcs3={} - c.funcs4={} - c.funcs5={} - c.func6={} - c.func7={} - c.func8={} - c.func9={} - c.func10={} - c.form="rectangle" - c.Color = {255, 255, 255} - c.scale={} - c.scale.size={} - c.scale.size.x=sw or 0 - c.scale.size.y=sh or 0 - c.offset={} - c.offset.size={} - c.offset.size.x=w or 0 - c.offset.size.y=h or 0 - c.scale.pos={} - c.scale.pos.x=sx or 0 - c.scale.pos.y=sy or 0 - c.offset.pos={} - c.offset.pos.x=x or 0 - c.offset.pos.y=y or 0 - c.VIS=true - c.Visible=true - c.Visibility=1 - c.BorderColor={0,0,0} - c.BorderSize=0 - c.Type="Part" - c.Name="GuiPart" - _GuiPro.count=_GuiPro.count+1 - c.x=(c.Parent.width*c.scale.pos.x)+c.offset.pos.x+c.Parent.x - c.y=(c.Parent.height*c.scale.pos.y)+c.offset.pos.y+c.Parent.y - c.width=(c.Parent.width*c.scale.size.x)+c.offset.size.x - c.height=(c.Parent.height*c.scale.size.y)+c.offset.size.y - table.insert(c.Parent.Children,c) - return c -end -function gui:newProgressBar(txt,x,y,w,h,sx,sy,sw,sh) - name="newProgressBar" - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("newProgressBarFrame",name, x, y, w, 30, sx ,sy ,sw ,sh) - c.Draggable=true - c.dragbut="r" - c.BorderSize=0 - c:ApplyGradient{Color.Blue,Color.sexy_purple} - c:newTextLabel(txt,"Holder",0,0,0,h-30,0,1,1,0).Color=Color.sexy_purple - c.funcO={} - c.funcX={} - c:OnDragStart(function(self) - self:TopStack() - end) - local temp = c:newTextButton("X","Close",-25,5,20,20,1) - temp.Tween=-5 - temp.XTween=-2 - temp:OnReleased(function(b,self) for i=1,#self.Parent.funcX do self.Parent.funcX[i](self.Parent) end end) - temp.Color=Color.Red - c.BarBG=c:newTextButton("",5,h-65,-10,30,0,1,1) - c.BarBG:ApplyGradient{Color.Red,Color.light_red} - c.Bar=c.BarBG:newTextLabel("",0,0,0,0,0,0,0,1) - c.Bar:ApplyGradient{Color.Green,Color.light_green} - c.BarDisp=c.BarBG:newTextLabel("0%","0%",0,0,0,0,0,0,1,1) - c.BarDisp.Visibility=0 - c.BarDisp.Link=c.Bar - c.BarDisp:OnUpdate(function(self) - self.text=self.Link.scale.size.x*100 .."%" - end) - c.Func1={} - function c:On100(func) - table.insert(self.Func1,func) - end - c:OnUpdate(function(self) - if self.Bar.scale.size.x*100>=100 then - for P=1,#self.Func1 do - self.Func1[P](self) - end - end - end) - function c:SetPercentage(n) - self.Bar:SetDualDim(0,0,0,0,0,0,n/100,1) - end - return c -end -function gui:newScrollBar(color1,color2) - local scrollbar=self:newFrame(-20,0,20,0,1,0,0,1) - scrollbar.funcS={} - scrollbar.Color=color1 or Color.saddle_brown - scrollbar:OnClicked(function(b,self,x,y) - love.mouse.setX(self.x+10) - if y>=10 and y<=self.height-10 then - self.mover:SetDualDim(0,y-10) - end - if y<10 then - love.mouse.setY(10+self.y) - end - if y>self.height-10 then - love.mouse.setY((self.height-10)+self.y) - end - for i=1,#self.funcS do - self.funcS[i](self,self:getPosition()) - end - end) - scrollbar:OnEnter(function(self) - self:addDominance() - end) - scrollbar:OnExit(function(self) - self:removeDominance() - end) - scrollbar.mover=scrollbar:newTextButton("","",0,0,20,20) - scrollbar.mover.Color=color2 or Color.light_brown - function scrollbar:getPosition() - return ((self.mover.offset.pos.y)/(self.height-20))*100 - end - function scrollbar:setPosition(n) - print((self.height-20),n) - self.mover.offset.pos.y=((self.height-20)/(100/n)) - for i=1,#self.funcS do - self.funcS[i](self,self:getPosition()) - end - end - function scrollbar:OnScroll(func) - table.insert(self.funcS,func) - end - return scrollbar -end -function gui:newScrollMenu(title,tabN,onloop,x, y, w, h, sx ,sy ,sw ,sh) - local Main = self:newFrame(x, y, w, h, sx ,sy ,sw ,sh) - local Title=Main:newTextButton(title,"Title",0,0,0,20,0,0,1) - Title.Tween=-4 - Title.FontSize=12 - Title:OnReleased(function(b,self) - self.Parent.Tick=not(self.Parent.Tick) - end) - local scroll=Main:newTextButton("","Scroll",-20,20,20,-20,1,0,0,1) - scroll:OnClicked(function(b,self,x,y) - self.Parent.Mover:SetDualDim(0,y-10,20,20) - if self.Parent.Mover.offset.pos.y<0 then - self.Parent.Mover:SetDualDim(0,0,20,20) - end - if self.Parent.Mover.offset.pos.y>self.Parent.height-40 then - self.Parent.Mover:SetDualDim(0,self.Parent.height-40,20,20) - end - local temp = #self.Parent.TList - self.Parent.pos=(math.floor((temp*self.Parent.Mover.offset.pos.y)/self.height))+1 - end) - Main:OnUpdate(function(self) - if self.Tick==false then - self.Visibility=0 - end - end) - scroll:OnUpdate(function(self) - self.Visible=self.Parent.Tick - end) - local Mover=scroll:newTextLabel("",0,0,20,20) - Main.Mover=Mover - Main.TList=tabN - Main.pos=1 - Main.Tick=true - function Main:Update(title,tabN,onloop) - ch=self:getChildren() - for i=#ch,1,-1 do - ch[i]:Destroy() - end - Title=Main:newTextButton(title,"Title",0,0,0,20,0,0,1) - Title.Tween=-4 - Title.FontSize=12 - Title:OnReleased(function(b,self) - self.Parent.Tick=not(self.Parent.Tick) - end) - scroll=Main:newTextButton("","Scroll",-20,20,20,-20,1,0,0,1) - scroll:OnClicked(function(b,self,x,y) - self.Parent.Mover:SetDualDim(0,y-10,20,20) - if self.Parent.Mover.offset.pos.y<0 then - self.Parent.Mover:SetDualDim(0,0,20,20) - end - if self.Parent.Mover.offset.pos.y>self.Parent.height-40 then - self.Parent.Mover:SetDualDim(0,self.Parent.height-40,20,20) - end - local temp = #self.Parent.TList - self.Parent.pos=(math.floor((temp*self.Parent.Mover.offset.pos.y)/self.height))+1 - end) - local Mover=scroll:newTextLabel("",0,0,20,20) - Main.Mover=Mover - Main.TList=tabN - Main.pos=1 - Main.Tick=true - scroll:OnUpdate(function(self) - self.Visible=self.Parent.Tick - end) - for i=1,math.floor(Main.height/20)-1 do - local temp=Main:newTextButton("","Item"..i,0,i*20,-20,20,0,0,1) - temp.FontSize=10 - temp.Tween=-4 - temp.pos=i - temp:OnUpdate(function(self) - self.text=self.Parent.TList[(self.Parent.pos+self.pos)-1] - self.Visible=self.Parent.Tick - end) - if onloop then - onloop(temp,i) - end - end - end - io.write(tostring(Main.height).."\n") - for i=1,math.floor(Main.height/20)-1 do - local temp=Main:newTextButton("Item"..i,0,i*20,-20,20,0,0,1) - temp.FontSize=10 - temp.Tween=-4 - temp.pos=i - temp:OnUpdate(function(self) - if self.Parent.TList[(self.Parent.pos+self.pos)-1]~=nil then - self.text=self.Parent.TList[(self.Parent.pos+self.pos)-1] - else - self.text="" - end - self.Visible=self.Parent.Tick - end) - if onloop then - onloop(temp,i) - end - end - return Main -end -function gui:destroyAllChildren() - local c=self.Children - for i=1,#c do - c[i]:Destroy() - end -end -function gui:removeDominance() - _GuiPro.TopHovered=nil -end -function gui:respectHierarchy() - _GuiPro.Hierarchy=true -end -function gui.round(num, idp) - local mult = 10^(idp or 0) - return math.floor(num * mult + 0.5) / mult -end -function gui.setBG(i) - gui.ff:SetImage(i) -end -function gui:setColor(a,b,c) - if type(a)=="string" then - self.Color=Color[a] - elseif type(a)=="number" then - self.Color=Color.new(a,b,c) - end -end -function gui:setTextColor(a,b,c) - if type(a)=="string" then - self.TextColor=Color[a] - elseif type(a)=="number" then - self.TextColor=Color.new(a,b,c) - end -end -function gui:setDefualtFont(font) - _defaultfont = font -end -function gui:SetDualDim(x, y, w, h, sx ,sy ,sw ,sh) - if _GuiPro.DPI_ENABLED then - if x then - x=self.DPI*x - end - if y then - y=self.DPI*y - end - if w then - w=self.DPI*w - end - if h then - h=self.DPI*h - end - end - if sx then - self.scale.pos.x=sx - end - if sy then - self.scale.pos.y=sy - end - if x then - self.offset.pos.x=x - end - if y then - self.offset.pos.y=y - end - if sw then - self.scale.size.x=sw - end - if sh then - self.scale.size.y=sh - end - if w then - self.offset.size.x=w - end - if h then - self.offset.size.y=h - end - if self.Image then - self:SetImage(self.Image) - end -end -function gui:setDualDim(...) - self:SetDualDim(...) -end -function gui:setText(txt) - self.text=txt -end -function gui:getText(txt) - return self.text -end ---_GuiPro.CursorN=love.mouse.getSystemCursor("arrow") ---_GuiPro.CursorH=love.mouse.getSystemCursor("hand") -function gui:SetHand(img,x,y) - --_GuiPro.CursorN=love.mouse.newCursor(img,x,y) -end -function gui:setHotKey(key) - local tab=key:split("+") - self.hotkeys=tab - self.cooldown=false - self.Alarm=multi:newAlarm(1) - self.Alarm.parent=self - self.args={} - self.funcHK=multi:newConnection() - self.Alarm:OnRing(function(alarm) alarm.parent.cooldown=false end) - function self:OnHotKey(func) - self.funcHK:connect(func) - end - self:OnUpdate(function(self) - if self.cooldown then return end - for i=1,#self.hotkeys do - if not(love.keyboard.isDown(self.hotkeys[i])) then - return - end - end - self.cooldown=true - self.funcHK:Fire(self) - self.Alarm:Reset() - end) -end -function gui:SetHover(img,x,y) - --_GuiPro.CursorH=love.mouse.newCursor(img,x,y) -end -function gui:SetName(name) - self.Parent.Children[name]=self - self.Name=name -end -function gui:setNewFont(FontSize) - self.Font=love.graphics.setNewFont(tonumber(FontSize)) -end -function gui:setParent(parent,name)-- Needs fixing!!! - local temp=self.Parent:getChildren() - for i=1,#temp do - if temp[i]==self then - table.remove(self.Parent.Children,i) - break - end - end - table.insert(parent.Children,self) - self.Parent=parent - if name then - self:SetName(name) - end -end -function gui:setVisiblity(val) - self.Visible=val - self.oV=val - doto=self:GetAllChildren() - if val==false then - for i=1,#doto do - doto[i].Visible=val - end - else - for i=1,#doto do - doto[i].Visible=doto[i].oV - end - end -end -function gui:TopStack() - childs=self.Parent:getChildren() - for i=1,#childs do - if childs[i]==self then - table.remove(self.Parent.Children,i) - table.insert(self.Parent.Children,self) - break - end - end -end -function string:insert(p,s) - return ("%s%s%s"):format(self:sub(1,p), s, self:sub(p+1)) -end -function string:remove(p,l) - l=l or 1 - return ("%s%s"):format(self:sub(1,p-1), self:sub(p+l)) -end -function gui:newTextBox(t,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("TextBox",name, x, y, w, h, sx ,sy ,sw ,sh) - c.ClearOnFocus=false - c.LoseFocusOnEnter=true - c.Tween=0 - c.XTween=0 - c.FontHeight=_defaultfont:getHeight() - c.Font=_defaultfont - c.FontSize=15 - c.TextFormat="center" - c.text = t - c.ttext= t - c.AutoScaleText=false - c.TextVisibility=1 - c.Color = {220, 220, 220} - c.TextColor = {0, 0, 0} - c.Active=false - c.hidden=false - c.cursor={0,1} - c.mark=nil - c.arrowkeys=false - c.funcF={function() - love.keyboard.setTextInput(true) - end} - c.cooldown=false - c.cooldown2=false - c.funcE={function() - love.keyboard.setTextInput(false) - end} - function c:triggerEnter() - for cc=1,#self.funcE do - self.funcE[cc](self,self.ttext) - end - self.text="" - self.ttext="" - end - c.Enter=true - c.Alarm=multi:newAlarm(.1) - c.Alarm.parent=c - c.Alarm:OnRing(function(alarm) alarm.parent.cooldown=false end) - c.Alarm2=multi:newAlarm(.5) - c.Alarm2.parent=c - c.Alarm2:OnRing(function(alarm) alarm.parent.cooldown2=false end) - c.ArrowAlarm=multi:newAlarm(.1) - c.ArrowAlarm.parent=c - c.ArrowAlarm:OnRing(function(alarm) alarm.parent.arrowkeys=false end) - function c:OnFocus(func) - table.insert(self.funcF,func) - end - function c:OnEnter(func) - table.insert(self.funcE,func) - end - c:OnClicked(function(b,self) - for cc=1,#self.funcF do - self.funcF[cc](self) - end - if self.Active==false then - if self.ClearOnFocus==true then - self.text="" - self.ttext="" - end - for tb=1,#gui.TB do - if gui.TB[tb]~=nil then - gui.TB[tb].Active=false - end - end - self.Active=true - end - end) - c:OnClicked(function(b,self,x,y) - local dwidth, wrappedtext = _defaultfont:getWrap(self.text:sub(1,self.cursor[1]), self.width) - local height = _defaultfont:getHeight() - if #wrappedtext>=1 then - width= _defaultfont:getWidth(wrappedtext[#wrappedtext]) - self.cursor[2]=#wrappedtext - else - self.cursor[2]=1 - width=0 - end - yc=math.ceil(((y/self.DPI)-(self.FontHeight/2)+self.Tween-self.y)/height) - xc=math.floor(x) - end) - c:AddDrawRuleE(function(self) - if self.Active then - local dwidth, wrappedtext = _defaultfont:getWrap(self.text:sub(1,self.cursor[1]), self.width) - local height = _defaultfont:getHeight() - if #wrappedtext>=1 then - width= _defaultfont:getWidth(wrappedtext[#wrappedtext]) - self.cursor[2]=#wrappedtext - else - self.cursor[2]=1 - width=0 - end - x1=width+2+self.x+self.XTween - y1=(self.y+(height*(self.cursor[2]-1))+(self.FontHeight/2)+self.Tween)*self.DPI - x2=width+2+self.x+self.XTween - y2=(self.y+(self.FontHeight/2)+self.Tween*self.DPI)+height*self.cursor[2] - love.graphics.line(x1,y1,x2,y2) - end - end) - c:OnUpdate(function(self) - if love.keyboard.isDown("backspace") and self.Active and self.cooldown==false then - if #self.text>0 then - self.text = self.text:remove(self.cursor[1]) - self.ttext = self.ttext:remove(self.cursor[1]) - self.cursor[1]=self.cursor[1]-1 - end - self.cooldown=true - self.Alarm:Reset() - elseif love.keyboard.isDown("backspace")==false then - self.cooldown=false - end - if love.keyboard.isDown("left") and self.arrowkeys==false and self.Active then - self.arrowkeys=true - self.cursor[1]=self.cursor[1]-1 - if self.cursor[1]<0 then - self.cursor[1]=0 - end - self.ArrowAlarm:Reset() - elseif love.keyboard.isDown("right") and self.arrowkeys==false and self.Active then - self.arrowkeys=true - self.cursor[1]=self.cursor[1]+1 - if self.cursor[1]>#self.text then - self.cursor[1]=#self.text - end - self.ArrowAlarm:Reset() - end - if love.keyboard.isDown("delete") and self.Active then - if #self.text>0 then - self.text = "" - self.ttext = "" - self.cursor[1]=1 - end - elseif (love.keyboard.isDown("lshift") or love.keyboard.isDown("rshift")) and love.keyboard.isDown("return") and self.cooldown2==false then - self.text=self.text.."\n" - self.ttext=self.ttext.."\n" - self.cooldown2=true - c.Alarm2:Reset() - elseif (love.keyboard.isDown("return") or love.keyboard.isDown("enter") or love.keyboard.isDown("kpenter")) and self.Active and self.Enter and not(love.keyboard.isDown("lshift") or love.keyboard.isDown("rshift")) then - if self.LoseFocusOnEnter then - self.Active=false - else - self.Active=true - end - for cc=1,#self.funcE do - self.funcE[cc](self,self.ttext) - end - end - end) - table.insert(gui.TB,c) - return c -end ---TEXT BOX HELPER FUNCTION -function love.textinput(t) - for tb=1,#gui.TB do - if gui.TB[tb]~=nil then - if gui.TB[tb].Active then - if gui.TB[tb].hidden then - --gui.TB[tb].text=gui.TB[tb].text.."*" - gui.TB[tb].text=gui.TB[tb].text:insert(gui.TB[tb].cursor[1],"*") - else - --gui.TB[tb].text=gui.TB[tb].text..t - gui.TB[tb].text=gui.TB[tb].text:insert(gui.TB[tb].cursor[1],t) - end - gui.TB[tb].ttext=gui.TB[tb].ttext:insert(gui.TB[tb].cursor[1],t) - gui.TB[tb].cursor[1]=gui.TB[tb].cursor[1]+1 - end - end - end -end -function gui:newTextButton(t,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("TextButton",name, x, y, w, h, sx ,sy ,sw ,sh) - c.Tween=0 - c.XTween=0 - c.FontHeight=_defaultfont:getHeight() - c.Font=_defaultfont - c.FontSize=15 - c.TextFormat="center" - c.text = t - c.AutoScaleText=false - c.TextVisibility=1 -- 0=invisible,1=solid (self.TextVisibility*254+1) - c.Color = {220, 220, 220} - c.TextColor = {0, 0, 0} - c:OnEnter(function() - --love.mouse.setCursor(_GuiPro.CursorH) - end) - c:OnExit(function() - --love.mouse.setCursor(_GuiPro.CursorN) - end) - return c -end -function gui:newTextLabel(t,name, x, y, w, h, sx ,sy ,sw ,sh) - x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) - local c=self:newBase("TextLabel",name, x, y, w, h, sx ,sy ,sw ,sh) - c.Tween=0 - c.XTween=0 - c.FontHeight=_defaultfont:getHeight() - c.Font=_defaultfont - c.FontSize=15 - c.TextFormat="center" - c.text = t - c.AutoScaleText=false - c.TextVisibility=1 -- 0=invisible,1=solid (self.TextVisibility*254+1) - c.Color = {220, 220, 220} - c.TextColor = {0, 0, 0} - return c -end -function gui:AddDrawRuleB(rule) - if not(self.DrawRulesB) then self.DrawRulesB={} end - table.insert(self.DrawRulesB,rule) -end -function gui:AddDrawRuleE(rule) - if not(self.DrawRulesE) then self.DrawRulesE={} end - table.insert(self.DrawRulesE,rule) -end -function gui:draw() - if _GuiPro.rotate~=0 then - love.graphics.rotate(math.rad(_GuiPro.rotate)) - end - if self.FormFactor:lower()=="rectangle" then - self:drawR() - elseif self.FormFactor:lower()=="circle" then - self:drawC() - else - error("Unsupported FormFactor: "..self.FormFactor.."!") - end -end -function gui:drawC() - if love.mouse.isDown("l")==false and love.mouse.isDown("m")==false and love.mouse.isDown("r")==false then - _GuiPro.DragItem={} - _GuiPro.hasDrag=false - end - if self.Visible==true and self.VIS==true then - local b=true - for i,v in pairs(_GuiPro.Clips) do - if self:isDescendant(v)==true then - b=false - end - end - if b then - love.graphics.setStencilTest( ) - _GuiPro.HasStencel=false - _GuiPro.StencelHolder=nil - end - local x,y,r,s=(self.offset.pos.x or 0)+self.Parent.x,(self.offset.pos.y or 0)+self.Parent.y,self.offset.size.x or 0,self.offset.size.y or 360 - if self.CC then - x,y=x+r,y+r - end - self.x,self.y=x,y - _GuiPro.circleStencilFunction = function() - love.graphics.circle("fill",x,y,r,s) - end - if math.sqrt((love.mouse.getX()-x)^2+(love.mouse.getY()-y)^2)<=r and self:eventable() and self:Clickable() and self.Active==true then - self.hovering=true - if love.mouse.isDown("l") and _GuiPro.hasDrag==false then - if string.find(self.Type, "Button") then - love.graphics.setColor(self.Color[1]-10, self.Color[2]-10, self.Color[3]-10,self.Visibility*254) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility*254) - end - self.lclicked=true - elseif love.mouse.isDown("r") and _GuiPro.hasDrag==false then - if string.find(self.Type, "Button") then - love.graphics.setColor(self.Color[1]-10, self.Color[2]-10, self.Color[3]-10,self.Visibility*254) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility*254) - end - self.rclicked=true - elseif love.mouse.isDown("m") and _GuiPro.hasDrag==false then - if string.find(self.Type, "Button") then - love.graphics.setColor(self.Color[1]-10, self.Color[2]-10, self.Color[3]-10,self.Visibility*254) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility*254) - end - self.mclicked=true - else - if string.find(self.Type, "Button") and _GuiPro.hasDrag==false then - love.graphics.setColor(self.Color[1]-5, self.Color[2]-5, self.Color[3]-5,self.Visibility*254) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility*254) - end - self.rclicked=false - self.lclicked=false - self.mclicked=false - end - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility*254) - self.hovering=false - self.rclicked=false - self.lclicked=false - self.mclicked=false - end - if self.ClipDescendants==true then - _GuiPro.Clips[tostring(self)]=self - _GuiPro.HasStencel=true - _GuiPro.StencelHolder=self - love.graphics.stencil(_GuiPro.circleStencilFunction) - love.graphics.setStencilTest("notequal",0) - end - love.graphics.circle("fill",x,y,r,s) - love.graphics.setColor(self.BorderColor[1], self.BorderColor[2], self.BorderColor[3],self.Visibility*254) - for b=0,self.BorderSize-1 do - love.graphics.circle("line",x,y,r+b,s) - end - if string.find(self.Type, "Text") then - if self.text~=nil then - if self.AutoScaleText then - self.FontSize=math.floor(self.height/1.45833) - end - love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility*254) - love.graphics.setFont(self.Font) - love.graphics.printf(self.text, x-(r/2)+(self.XTween), y-(r/2)+self.Tween, r, self.TextFormat) - end - end - end -end -function gui:drawR() - if love.mouse.isDown("l")==false and love.mouse.isDown("m")==false and love.mouse.isDown("r")==false then - _GuiPro.DragItem={} - _GuiPro.hasDrag=false - end - if self.Visible==true and self.VIS==true then - local b=true - for i,v in pairs(_GuiPro.Clips) do - if self:isDescendant(v)==true then - b=false - end - end - if b==true then - love.graphics.setStencilTest() - love.graphics.setScissor() - end - self.x=(self.Parent.width*self.scale.pos.x)+self.offset.pos.x+self.Parent.x - self.y=(self.Parent.height*self.scale.pos.y)+self.offset.pos.y+self.Parent.y - self.width=(self.Parent.width*self.scale.size.x)+self.offset.size.x - self.height=(self.Parent.height*self.scale.size.y)+self.offset.size.y - if self.DrawRulesB then - for dr=1,#self.DrawRulesB do - self.DrawRulesB[dr](self) - end - end - if (love.mouse.getX() > self.x and love.mouse.getX() < self.x+self.width and love.mouse.getY() > self.y and love.mouse.getY() < self.y+self.height and self:Clickable() and self:eventable()) or self:touchable("r") and self.Active==true then - self.hovering=true - if love.mouse.isDown("l") or self:touchable("r") and _GuiPro.hasDrag==false then - if string.find(self.Type, "Button") then - love.graphics.setColor(self.Color[1]-10, self.Color[2]-10, self.Color[3]-10,self.Visibility*254) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility*254) - end - self.lclicked=true - elseif love.mouse.isDown("r") or self:touchable("r") and _GuiPro.hasDrag==false then - if string.find(self.Type, "Button") then - love.graphics.setColor(self.Color[1]-10, self.Color[2]-10, self.Color[3]-10,self.Visibility*254) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility*254) - end - self.rclicked=true - elseif love.mouse.isDown("m") or self:touchable("r") and _GuiPro.hasDrag==false then - if string.find(self.Type, "Button") then - love.graphics.setColor(self.Color[1]-10, self.Color[2]-10, self.Color[3]-10,self.Visibility*254) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility*254) - end - self.mclicked=true - else - if string.find(self.Type, "Button") or self:touchable("r") and _GuiPro.hasDrag==false then - love.graphics.setColor(self.Color[1]-5, self.Color[2]-5, self.Color[3]-5,self.Visibility*254) - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility*254) - end - self.rclicked=false - self.lclicked=false - self.mclicked=false - end - else - love.graphics.setColor(self.Color[1],self.Color[2],self.Color[3],self.Visibility*254) - self.hovering=false - self.rclicked=false - self.lclicked=false - self.mclicked=false - end - if self.ClipDescendants==true then - _GuiPro.Clips[tostring(self)]=self - love.graphics.setScissor(self.x, self.y, self.width, self.height) - end - if self:hasRoundness() then - love.graphics.stencil(self.stfunc, "replace", 1) - love.graphics.setStencilTest("greater", 0) - end - love.graphics.rectangle("fill", self.x, self.y, self.width, self.height,(self.rx or 1)*self.DPI,(self.ry or 1)*self.DPI,(self.segments or 1)*self.DPI) - if string.find(self.Type, "Image") then - self:ImageRule() - end - if self.Type=="Video" then - self:VideoRule() - end - if self:hasRoundness() then - love.graphics.setStencilTest() - end - love.graphics.setColor(self.BorderColor[1], self.BorderColor[2], self.BorderColor[3],self.Visibility*254) - for b=0,self.BorderSize-1 do - love.graphics.rectangle("line", self.x-(b/2), self.y-(b/2), self.width+b, self.height+b,(self.rx or 1)*self.DPI,(self.ry or 1)*self.DPI,(self.segments or 1)*self.DPI) - end - if string.find(self.Type, "Text") then - if self.text~=nil then - if self.AutoScaleText then - self.FontSize=math.floor(self.height/1.45833) - end - love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility*254) - if self.Font==_defaultfont then - love.graphics.setFont(self.Font) - love.graphics.printf(self.text, self.x+2+(self.XTween*self.DPI)+((self.marginL or 0)*self.DPI or self.XTween*self.DPI), self.y+(self.FontHeight/2)+self.Tween*self.DPI, self.width+(0 or (self.marginR or 0)*self.DPI), self.TextFormat) - else - if type(self.Font)=="string" then - self.Font=love.graphics.newFont(self.Font,self.FontSize) - self.FontHeight=self.Font:getHeight() - else - love.graphics.setFont(self.Font) - end - if type(self.FontSize)=="string" then - self.FontSize=tonumber(self.FontSize) - love.graphics.setNewFont(self.FontSize) - end - love.graphics.printf(self.text, self.x+2+((self.marginL or 0)*self.DPI or self.XTween*self.DPI), self.y+math.floor((self.FontHeight-self.FontSize)/2)+self.Tween*self.DPI, self.width+(0 or (self.marginR or 0)*self.DPI), self.TextFormat) - end - end - end - if self.DrawRulesE then - for dr=1,#self.DrawRulesE do - self.DrawRulesE[dr](self) - end - end - end -end - -gui:respectHierarchy() -_GuiPro.width,_GuiPro.height=love.graphics.getDimensions() -multi:newLoop():OnLoop(function() _GuiPro.width,_GuiPro.height=love.graphics.getDimensions() _GuiPro:update() end) -multi:onDraw(function() _GuiPro:draw() end) -gui.ff=gui:newFrame("",0,0,0,0,0,0,1,1) -gui.ff.Color={255,255,255} -gui.ff:OnUpdate(function(self) - self:BottomStack() -end) - diff --git a/examples/love2d Threading Example/core/Library.lua b/examples/love2d Threading Example/core/Library.lua deleted file mode 100644 index 8260136..0000000 --- a/examples/love2d Threading Example/core/Library.lua +++ /dev/null @@ -1,319 +0,0 @@ -if table.unpack then - unpack=table.unpack -end -function table.val_to_str ( v ) - if "string" == type( v ) then - v = string.gsub( v, "\n", "\\n" ) - if string.match( string.gsub(v,"[^'\"]",""), '^"+$' ) then - return "'" .. v .. "'" - end - return '"' .. string.gsub(v,'"', '\\"' ) .. '"' - else - return "table" == type( v ) and table.tostring( v ) or - tostring( v ) - end -end - -function table.key_to_str ( k ) - if "string" == type( k ) and string.match( k, "^[_%a][_%a%d]*$" ) then - return k - else - return "[" .. table.val_to_str( k ) .. "]" - end -end - -function table.tostring( tbl ) - local result, done = {}, {} - for k, v in ipairs( tbl ) do - table.insert( result, table.val_to_str( v ) ) - done[ k ] = true - end - for k, v in pairs( tbl ) do - if not done[ k ] then - table.insert( result, - table.key_to_str( k ) .. "=" .. table.val_to_str( v ) ) - end - end - return "{" .. table.concat( result, "," ) .. "}" -end -function table.merge(t1, t2) - t1,t2= t1 or {},t2 or {} - for k,v in pairs(t2) do - if type(v) == "table" then - if type(t1[k] or false) == "table" then - table.merge(t1[k] or {}, t2[k] or {}) - else - t1[k] = v - end - else - t1[k] = v - end - end - return t1 -end -Library={} -function Library.optimize(func) - local test=Library.convert(func) - rawset(test,"link",{}) - rawset(test,"last","") - rawset(test,"org",func) - test:inject(function(...) - rawset(test,"last",table.tostring({...})) - if test.link[test.last]~=nil then - return Library.forceReturn(unpack(test.link[test.last])) - end - return {...} - end,1) - test:inject(function(...) - test.link[test.last]={test.org(...)} - return test.org(...) - end) - return test -end -function Library.forceReturn(...) - return {[0]="\1\7\6\3\2\99\125",...} -end -function Library.inject(lib,dat,arg) - if type(lib)=="table" then - if type(dat)=="table" then - table.merge(lib,dat) - elseif type(dat)=="string" then - if lib.Version and dat:match("(%d-)%.(%d-)%.(%d-)") then - lib.Version={dat:match("(%d+)%.(%d+)%.(%d+)")} - elseif dat=="meta" and type(arg)=="table" then - local _mt=getmetatable(lib) or {} - local mt={} - table.merge(mt,arg) - table.merge(_mt,mt) - setmetatable(lib,_mt) - elseif dat=="compat" then - lib["getVersion"]=function(self) return self.Version[1].."."..self.Version[2].."."..self.Version[3] end - if not lib.Version then - lib.Version={1,0,0} - end - elseif dat=="inhert" then - if not(lib["!%"..arg.."%!"]) then print("Wrong Password!!") return end - lib["!%"..arg.."%!"].__index=lib["!!%"..arg.."%!!"] - end - elseif type(dat)=="function" then - for i,v in pairs(lib) do - dat(lib,i,v) - end - end - elseif type(lib)=="function" or type(lib)=="userdata" then - if lib==unpack then - print("function unpack cannot yet be injected!") - return unpack - elseif lib==pairs then - print("function pairs cannot yet be injected!") - return lib - elseif lib==ipairs then - print("function ipairs cannot yet be injected!") - return lib - elseif lib==type then - print("function type cannot yet be injected!") - return lib - end - temp={} - local mt={ - __call=function(t,...) - local consume,MainRet,init={},{},{...} - local tt={} - for i=1,#t.__Link do - tt={} - if t.__Link[i]==t.__Main then - if #consume~=0 then - MainRet={t.__Link[i](unpack(consume))} - else - MainRet={t.__Link[i](unpack(init))} - end - else - if i==1 then - consume=(t.__Link[i](unpack(init))) - else - if type(MainRet)=="table" then - table.merge(tt,MainRet) - end - if type(consume)=="table" then - table.merge(tt,consume) - end - consume={t.__Link[i](unpack(tt))} - end - if i==#t.__Link then - return unpack(consume) - end - if consume then if consume[0]=="\1\7\6\3\2\99\125" then consume[0]=nil return unpack(consume) end end - end - end - if type(MainRet)=="table" then - table.merge(tt,MainRet) - end - if type(consume)=="table" then - table.merge(tt,consume) - end - return unpack(tt) - end, - } - temp.__Link={lib} - temp.__Main=lib - temp.__self=temp - function temp:inject(func,i) - if i then - table.insert(self.__Link,i,func) - else - table.insert(self.__Link,func) - end - end - function temp:consume(func) - for i=1,#self.__Link do - if self.__Link[i]==self.__Main then - self.__Link[i]=func - self.__self.__Main=func - return true - end - end - return false - end - setmetatable(temp,mt) - Library.protect(temp,"lolz") - return temp - else - return "arg1 must be a table or a function" - end -end -function Library.parse(lib) - for i,v in pairs(lib) do - print(i,v) - end -end -function Library.protect(lib,pass) - pass=pass or "*" - local mt={} - local test={ - __index = lib, - __newindex = function(tab, key, value) - local t,b=key:find(tab["!%"..pass.."%!"].__pass,1,true) - if t then - local _k=key:sub(b+1) - rawset(tab,_k,value) - else - error("Cannot alter a protected library!") - end - end, - __metatable = false, - __pass=pass or "*" - } - local _mt=getmetatable(lib) or {} - table.merge(mt,_mt) - table.merge(mt,test) - lib["!%"..pass.."%!"]=test - lib["!!%"..pass.."%!!"]=lib - local temp=setmetatable({},mt) - for i,v in pairs(_G) do - if v==lib then - _G[i]=temp - Library(function(link) - link[i]=v - end) - end - end -end -function Library.unprotect(lib,pass) - if not(lib["!%"..pass.."%!"]) then print("Wrong Password or Library is not Protected!") return end - if lib["!%"..pass.."%!"].__pass==pass then - lib["!%"..pass.."%!"].__newindex=lib["!!%"..pass.."%!!"] - lib["!%"..pass.."%!"].__index=nil - lib["!%"..pass.."%!"].__newindex=nil - lib["!%"..pass.."%!"].__metatable = true - setmetatable(lib["!!%"..pass.."%!!"],lib["!%"..pass.."%!"]) - for i,v in pairs(_G) do - if v==lib then - _G[i]=lib["!!%"..pass.."%!!"] - end - end - lib["!!%"..pass.."%!!"]["!%"..pass.."%!"]=nil - lib["!!%"..pass.."%!!"]["!!%"..pass.."%!!"]=nil - else - print("Wrong Password!!!") - end -end -function Library.addPoll(lib,polldata,ref) - lib.__polldata={} - Library.inject(lib.__polldata,polldata) - if type(ref)=="table" then - Library.inject(ref,"meta",{__newindex=function(t,k,v) - t[k].__polldata=polldata - end}) - end -end -function Library.newPollData(t) - local temp={} - temp.__onPolled=function() end - temp.__pollData=false - temp.__advDisc="" - temp.__pollcalls=-1 -- infinte - for i,v in pairs(t) do - if type(v)=="string" then - temp.__advDisc=v - elseif type(v)=="number" then - temp.__pollcalls=v - elseif type(v)=="table" then - temp[v[1]]=v[2] - elseif type(v)=="function" then - temp.__onPolled=v - elseif type(v)=="boolean" then - temp.__pollData=v - else - temp.__userdata=v - end - end - return temp -end -function Library.convert(...) - local temp,rets={...},{} - for i=1,#temp do - if type(temp[i])=="function" then - table.insert(rets,Library.inject(temp[i])) - else - error("Takes only functions and returns in order from functions given. arg # "..i.." is not a function!!! It is a "..type(temp[i])) - end - end - return unpack(rets) -end -function Library.convertIn(...) - local temp,list={...},{} - for i=1,#temp do - if type(temp[i])=="table" then - for k,v in pairs(temp[i]) do - if type(v)=="function" then - temp[i][k]=Library.inject(temp[i][k]) - end - end - else - error("Takes only tables! Arg "..i.." isn't it is a "..type(temp[i])) - end - end -end -function Library.newInjectedFunction() - return Library.convert(function(...) return unpack{...} end) -end -function Library.capulate(lib) - Library.inject(lib,"meta",{ - __index=function(t,k,v) - for i,_v in pairs(t) do - if k:lower()==i:lower() then - return t[i] - end - end - end, - __newindex=function(t,k,v) - rawset(t,k:lower(),v) - end - }) -end -local link={MainLibrary=Library} -Library.inject(Library,"meta",{ - __Link=link, - __call=function(self,func) func(link) end, -}) ---Library.protect(Library,"N@#P!KLkk1(93320") diff --git a/examples/love2d Threading Example/core/README.txt b/examples/love2d Threading Example/core/README.txt deleted file mode 100644 index 02b5fb6..0000000 --- a/examples/love2d Threading Example/core/README.txt +++ /dev/null @@ -1,2 +0,0 @@ -These libraries Namely the MultiManager, bin, and the Library, libraries will be documented because i plan on sharing them -everything else will mostlikely not be documented \ No newline at end of file diff --git a/examples/love2d Threading Example/core/T1.lua b/examples/love2d Threading Example/core/T1.lua deleted file mode 100644 index f861efa..0000000 --- a/examples/love2d Threading Example/core/T1.lua +++ /dev/null @@ -1,598 +0,0 @@ -require("love.timer") -require("love.system") -require("love.sound") -require("love.physics") -require("love.mouse") -require("love.math") -require("love.keyboard") -require("love.joystick") -require("love.image") -require("love.font") -require("love.filesystem") -require("love.event") -require("love.audio") -require("love.graphics") -require("love.window") -_defaultfont = love.graphics.getFont() -gui = {} -function gui.getTile(i,x,y,w,h)-- returns imagedata - if type(i)=="userdata" then - -- do nothing - else - error("getTile invalid args!!! Usage: ImageElement:getTile(x,y,w,h) or gui:getTile(imagedata,x,y,w,h)") - end - local iw,ih=i:getDimensions() - local id,_id=i:getData(),love.image.newImageData(w,h) - for _x=x,w+x-1 do - for _y=y,h+y-1 do - _id:setPixel(_x-x,_y-y,id:getPixel(_x,_y)) - end - end - return love.graphics.newImage(_id) -end -multi = {} -multi.Version="4.0.0" -multi.__index = multi -multi.Mainloop={} -multi.Tasks={} -multi.Tasks2={} -multi.Garbage={} -multi.Children={} -multi.Paused={} -multi.MasterId=0 -multi.Active=true -multi.Id=-1 -multi.Type="MainInt" -multi.Rest=0 --- System -os.sleep=love.timer.sleep -function multi:newBase(ins) - if not(self.Type=="MainInt" or self.Type=="int") then error("Can only create an object on multi or an interface obj") return false end - local c = {} - if self.Type=="int" then - setmetatable(c, self.Parent) - else - setmetatable(c, self) - end - c.Active=true - c.func={} - c.Id=0 - c.Act=function() end - c.Parent=self - if ins then - table.insert(self.Mainloop,ins,c) - else - table.insert(self.Mainloop,c) - end - self.MasterId=self.MasterId+1 - return c -end -function multi:reboot(r) - self.Mainloop={} - self.Tasks={} - self.Tasks2={} - self.Garbage={} - self.Children={} - self.Paused={} - self.MasterId=0 - self.Active=true - self.Id=-1 - if r then - for i,v in pairs(_G) do - if type(i)=="table" then - if i.Parent and i.Id and i.Act then - i={} - end - end - end - end -end -function multi:getChildren() - return self.Mainloop -end ---Processor -function multi:Do_Order() - for _D=#self.Mainloop,1,-1 do - if self.Mainloop[_D]~=nil then - self.Mainloop[_D].Id=_D - self.Mainloop[_D]:Act() - end - if self.Mainloop[_D].rem then - table.remove(self.Mainloop,_D) - end - end - if self.Rest>0 then - os.sleep(self.Rest) - end -end -function multi:benchMark(sec) - local temp=self:newLoop(function(t,self) - if os.clock()-self.init>self.sec then - print(self.c.." steps in "..self.sec.." second(s)") - self.tt(self.sec) - self:Destroy() - else - self.c=self.c+1 - end - end) - function temp:OnBench(func) - self.tt=func - end - self.tt=function() end - temp.sec=sec - temp.init=os.clock() - temp.c=0 - return temp -end -function multi:newInterface() - if not(self.Type=="MainInt") then error("Can only create an interface on the multi obj") return false end - local c = {} - setmetatable(c, self) - c.Parent=self - c.Active=true - c.func={} - c.Id=0 - c.Type="int" - c.Mainloop={} - c.Tasks={} - c.Tasks2={} - c.Garbage={} - c.Children={} - c.Paused={} - c.MasterId=0 - c.Active=true - c.Id=-1 - c.Rest=0 - function c:Start() - if self.l then - self.l:Resume() - else - self.l=self.Parent:newLoop(function(dt) c:uManager(dt) end) - end - end - function c:Stop() - if self.l then - self.l:Pause() - end - end - function c:Remove() - self:Destroy() - self.l:Destroy() - end - return c -end ---Helpers -function multi:FreeMainEvent() - self.func={} -end -function multi:isPaused() - return not(self.Active) -end -function multi:Pause(n) - if self.Type=="int" or self.Type=="MainInt" then - self.Active=false - if not(n) then - local c=self:getChildren() - for i=1,#c do - c[i]:Pause() - end - else - self:hold(n) - end - else - if not(n) then - self.Active=false - if self.Parent.Mainloop[self.Id]~=nil then - table.remove(self.Parent.Mainloop,self.Id) - table.insert(self.Parent.Paused,self) - self.Id=#self.Parent.Paused - end - else - self:hold(n) - end - end -end -function multi:Resume() - if self.Type=="int" or self.Type=="MainInt" then - self.Active=true - local c=self:getChildren() - for i=1,#c do - c[i]:Resume() - end - else - if self:isPaused() then - self.Active=true - for i=1,#self.Parent.Paused do - if self.Parent.Paused[i]==self then - table.remove(self.Parent.Paused,i) - return - end - end - table.insert(self.Parent.Mainloop,self) - end - end -end -function multi:Destroy() - if self.Type=="int" or self.Type=="MainInt" then - local c=self:getChildren() - for i=1,#c do - c[i]:Destroy() - end - else - self.rem=true - end -end -function multi:hold(task) - self:Pause() - if type(task)=="number" then - local alarm=self:newAlarm(task) - while alarm.Active==true do - if love then - self.Parent.lManager() - else - self.Parent.Do_Order() - end - end - alarm:Destroy() - self:Resume() - elseif type(task)=="function" then - local env=self.Parent:newEvent(task) - env:OnEvent(function(envt) envt:Pause() envt:Stop() end) - while env.Active do - if love then - self.Parent.lManager() - else - self.Parent.Do_Order() - end - end - env:Destroy() - self:Resume() - else - print("Error Data Type!!!") - end -end -function multi:oneTime(func,...) - if not(self.Type=="MainInt" or self.Type=="int") then - for _k=1,#self.Parent.Tasks2 do - if self.Parent.Tasks2[_k]==func then - return false - end - end - table.insert(self.Parent.Tasks2,func) - func(...) - return true - else - for _k=1,#self.Tasks2 do - if self.Tasks2[_k]==func then - return false - end - end - table.insert(self.Tasks2,func) - func(...) - return true - end -end ---Constructors -function multi:newEvent(task) - local c=self:newBase() - c.Type="Event" - c.Task=task or function() end - function c:Act() - if self.Task(self) and self.Active==true then - self:Pause() - for _E=1,#self.func do - self.func[_E](self) - end - end - end - function c:OnEvent(func) - table.insert(self.func,func) - end - return c -end -function multi:newAlarm(set) - local c=self:newBase() - c.Type="Alarm" - c.timer=os.clock() - c.set=set or 0 - function c:Act() - if self.Active==true then - if os.clock()-self.timer>=self.set then - self:Pause() - for i=1,#self.func do - self.func[i](self) - end - end - end - end - function c:Reset(n) - if n then self.set=n end - self.timer=os.clock() - self:Resume() - end - function c:OnRing(func) - table.insert(self.func,func) - end - return c -end -function multi:newTask(func) - table.insert(self.Tasks,func) -end -function multi:newLoop(func) - local c=self:newBase() - c.Type="Loop" - if func then - c.func={func} - end - function c:Act() - if self.Active==true then - for i=1,#self.func do - self.func[i](os.clock()-self.Parent.Start,self) - end - end - end - function c:OnLoop(func) - table.insert(self.func,func) - end - return c -end -function multi:newStep(start,reset,count,skip) - local c=self:newBase() - think=1 - c.Type="Step" - c.pos=start or 1 - c.endAt=reset or math.huge - c.skip=skip or 0 - c.spos=0 - c.count=count or 1*think - c.funcE={} - c.start=start or 1 - if start~=nil and reset~=nil then - if start>reset then - think=-1 - end - end - function c:Act() - if self~=nil then - if self.spos==0 then - if self.Active==true then - for i=1,#self.func do - self.func[i](self.pos,self) - end - self.pos=self.pos+self.count - end - end - end - self.spos=self.spos+1 - if self.spos>=self.skip then - self.spos=0 - end - end - function c:OnStep(func) - table.insert(self.func,1,func) - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Update(start,reset,count,skip) - self.start=start or self.start - self.endAt=reset or self.endAt - self.skip=skip or self.skip - self.count=count or self.count - self:Resume() - end - c:OnStep(function(p,s) - if s.count>0 and s.endAt==p then - for fe=1,#s.funcE do - s.funcE[fe](s) - end - s.pos=s.start-1 - elseif s.count<0 and s.endAt==p then - for fe=1,#s.funcE do - s.funcE[fe](s) - end - s.pos=s.start-1 - end - end) - return c -end -function multi:newTStep(start,reset,count,set) - local c=self:newBase() - think=1 - c.Type="TStep" - c.start=start or 1 - local reset = reset or math.huge - c.endAt=reset - c.pos=start or 1 - c.skip=skip or 0 - c.count=count or 1*think - c.funcE={} - c.timer=os.clock() - c.set=set or 1 - function c:Update(start,reset,count,set) - self.start=start or self.start - self.pos=start - self.endAt=reset or self.endAt - self.set=set or self.set - self.count=count or self.count or 1 - self.timer=os.clock() - self:Resume() - end - function c:Act() - if self.Active then - if os.clock()-self.timer>=self.set then - self:Reset() - for i=1,#self.func do - self.func[i](self.pos,self) - end - if self.endAt==self.pos then - for fe=1,#self.funcE do - self.funcE[fe](self) - end - self.pos=self.start-1 - end - self.pos=self.pos+self.count - end - end - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Reset(n) - if n then self.set=n end - self.timer=os.clock() - self:Resume() - end - function c:OnStep(func) - table.insert(self.func,func) - end - return c -end -function multi:newTrigger(func) - local c=self:newBase() - c.Type="Trigger" - c.trigfunc=func or function() end - function c:Fire(...) - self:trigfunc(self,...) - end - return c -end ---Managers -function multi:mainloop() - for i=1,#self.Tasks do - self.Tasks[i](self) - end - self.Start=os.clock() - while self.Active do - self:Do_Order() - end -end -function multi._tFunc(self,dt) - for i=1,#self.Tasks do - self.Tasks[i](self) - end - print("once!") - if dt then - self.pump=true - end - self.pumpvar=dt - self.Start=os.clock() -end -function multi:uManager(dt) - self:oneTime(self._tFunc,self,dt) - self:Do_Order() -end -multi.drawF={} -function multi:dManager() - for ii=1,#multi.drawF do - multi.drawF[ii]() - end -end -function multi:onDraw(func) - table.insert(self.drawF,func) -end -function multi:lManager() - if love.event then - love.event.pump() - for e,a,b,c,d in love.event.poll() do - if e == "quit" then - if not love.quit or not love.quit() then - if love.audio then - love.audio.stop() - end - return nil - end - end - love.handlers[e](a,b,c,d) - end - end - if love.timer then - love.timer.step() - dt = love.timer.getDelta() - end - if love.update then love.update(dt) end - multi:uManager(dt) - if love.window and love.graphics and love.window.isCreated() then - love.graphics.clear() - love.graphics.origin() - if love.draw then love.draw() end - multi.dManager() - love.graphics.setColor(255,255,255,255) - if multi.draw then multi.draw() end - love.graphics.present() - end -end -Thread={} -Thread.Name="Thread 1" -Thread.ChannelThread = love.thread.getChannel("Easy1") -Thread.ChannelMain = love.thread.getChannel("EasyMain") -Thread.Global = {} -function Thread:packTable(G) - function escapeStr(str) - local temp="" - for i=1,#str do - temp=temp.."\\"..string.byte(string.sub(str,i,i)) - end - return temp - end - function ToStr(t) - local dat="{" - for i,v in pairs(t) do - if type(i)=="number" then - i="["..i.."]=" - else - i=i.."=" - end - if type(v)=="string" then - dat=dat..i.."\""..v.."\"," - elseif type(v)=="number" then - dat=dat..i..v.."," - elseif type(v)=="boolean" then - dat=dat..i..tostring(v).."," - elseif type(v)=="table" and not(G==v) then - dat=dat..i..ToStr(v).."," - --elseif type(v)=="table" and G==v then - -- dat=dat..i.."assert(loadstring(\"return self\"))," - elseif type(v)=="function" then - dat=dat..i.."assert(loadstring(\""..escapeStr(string.dump(v)).."\"))," - end - end - return string.sub(dat,1,-2).."}" - end - return "return "..ToStr(G) -end -function Thread:Send(name,var) - arg3="1" - if type(var)=="table" then - var=Thread:packTable(var) - arg3="table" - end - self.ChannelMain:push({name,var,arg3}) -end -function Thread:UnPackChannel() - local c=self.ChannelThread:getCount() - for i=1,c do - local temp=self.ChannelThread:pop() - if temp[1] and temp[2] then - if temp[1]=="func" and type(temp[2])=="string" then - loadstring(temp[2])(temp[3]) - elseif temp[1]=="table" then - _G[temp[3]]=loadstring(temp[2])() - else - _G[temp[1]]=temp[2] - end - end - end - if #multi:getChildren()<2 then - os.sleep(.05) - end -end -function Thread:boost(func,name) - self:Send(name,string.dump(func)) -end -function Thread.mainloop() - Thread:UnPackChannel() -end -Thread.MainThread=false -multi:newLoop():OnLoop(Thread.mainloop) -multi:mainloop() diff --git a/examples/love2d Threading Example/core/T2.lua b/examples/love2d Threading Example/core/T2.lua deleted file mode 100644 index 44e2fbf..0000000 --- a/examples/love2d Threading Example/core/T2.lua +++ /dev/null @@ -1,598 +0,0 @@ -require("love.timer") -require("love.system") -require("love.sound") -require("love.physics") -require("love.mouse") -require("love.math") -require("love.keyboard") -require("love.joystick") -require("love.image") -require("love.font") -require("love.filesystem") -require("love.event") -require("love.audio") -require("love.graphics") -require("love.window") -_defaultfont = love.graphics.getFont() -gui = {} -function gui.getTile(i,x,y,w,h)-- returns imagedata - if type(i)=="userdata" then - -- do nothing - else - error("getTile invalid args!!! Usage: ImageElement:getTile(x,y,w,h) or gui:getTile(imagedata,x,y,w,h)") - end - local iw,ih=i:getDimensions() - local id,_id=i:getData(),love.image.newImageData(w,h) - for _x=x,w+x-1 do - for _y=y,h+y-1 do - _id:setPixel(_x-x,_y-y,id:getPixel(_x,_y)) - end - end - return love.graphics.newImage(_id) -end -multi = {} -multi.Version="4.0.0" -multi.__index = multi -multi.Mainloop={} -multi.Tasks={} -multi.Tasks2={} -multi.Garbage={} -multi.Children={} -multi.Paused={} -multi.MasterId=0 -multi.Active=true -multi.Id=-1 -multi.Type="MainInt" -multi.Rest=0 --- System -os.sleep=love.timer.sleep -function multi:newBase(ins) - if not(self.Type=="MainInt" or self.Type=="int") then error("Can only create an object on multi or an interface obj") return false end - local c = {} - if self.Type=="int" then - setmetatable(c, self.Parent) - else - setmetatable(c, self) - end - c.Active=true - c.func={} - c.Id=0 - c.Act=function() end - c.Parent=self - if ins then - table.insert(self.Mainloop,ins,c) - else - table.insert(self.Mainloop,c) - end - self.MasterId=self.MasterId+1 - return c -end -function multi:reboot(r) - self.Mainloop={} - self.Tasks={} - self.Tasks2={} - self.Garbage={} - self.Children={} - self.Paused={} - self.MasterId=0 - self.Active=true - self.Id=-1 - if r then - for i,v in pairs(_G) do - if type(i)=="table" then - if i.Parent and i.Id and i.Act then - i={} - end - end - end - end -end -function multi:getChildren() - return self.Mainloop -end ---Processor -function multi:Do_Order() - for _D=#self.Mainloop,1,-1 do - if self.Mainloop[_D]~=nil then - self.Mainloop[_D].Id=_D - self.Mainloop[_D]:Act() - end - if self.Mainloop[_D].rem then - table.remove(self.Mainloop,_D) - end - end - if self.Rest>0 then - os.sleep(self.Rest) - end -end -function multi:benchMark(sec) - local temp=self:newLoop(function(t,self) - if os.clock()-self.init>self.sec then - print(self.c.." steps in "..self.sec.." second(s)") - self.tt(self.sec) - self:Destroy() - else - self.c=self.c+1 - end - end) - function temp:OnBench(func) - self.tt=func - end - self.tt=function() end - temp.sec=sec - temp.init=os.clock() - temp.c=0 - return temp -end -function multi:newInterface() - if not(self.Type=="MainInt") then error("Can only create an interface on the multi obj") return false end - local c = {} - setmetatable(c, self) - c.Parent=self - c.Active=true - c.func={} - c.Id=0 - c.Type="int" - c.Mainloop={} - c.Tasks={} - c.Tasks2={} - c.Garbage={} - c.Children={} - c.Paused={} - c.MasterId=0 - c.Active=true - c.Id=-1 - c.Rest=0 - function c:Start() - if self.l then - self.l:Resume() - else - self.l=self.Parent:newLoop(function(dt) c:uManager(dt) end) - end - end - function c:Stop() - if self.l then - self.l:Pause() - end - end - function c:Remove() - self:Destroy() - self.l:Destroy() - end - return c -end ---Helpers -function multi:FreeMainEvent() - self.func={} -end -function multi:isPaused() - return not(self.Active) -end -function multi:Pause(n) - if self.Type=="int" or self.Type=="MainInt" then - self.Active=false - if not(n) then - local c=self:getChildren() - for i=1,#c do - c[i]:Pause() - end - else - self:hold(n) - end - else - if not(n) then - self.Active=false - if self.Parent.Mainloop[self.Id]~=nil then - table.remove(self.Parent.Mainloop,self.Id) - table.insert(self.Parent.Paused,self) - self.Id=#self.Parent.Paused - end - else - self:hold(n) - end - end -end -function multi:Resume() - if self.Type=="int" or self.Type=="MainInt" then - self.Active=true - local c=self:getChildren() - for i=1,#c do - c[i]:Resume() - end - else - if self:isPaused() then - self.Active=true - for i=1,#self.Parent.Paused do - if self.Parent.Paused[i]==self then - table.remove(self.Parent.Paused,i) - return - end - end - table.insert(self.Parent.Mainloop,self) - end - end -end -function multi:Destroy() - if self.Type=="int" or self.Type=="MainInt" then - local c=self:getChildren() - for i=1,#c do - c[i]:Destroy() - end - else - self.rem=true - end -end -function multi:hold(task) - self:Pause() - if type(task)=="number" then - local alarm=self:newAlarm(task) - while alarm.Active==true do - if love then - self.Parent.lManager() - else - self.Parent.Do_Order() - end - end - alarm:Destroy() - self:Resume() - elseif type(task)=="function" then - local env=self.Parent:newEvent(task) - env:OnEvent(function(envt) envt:Pause() envt:Stop() end) - while env.Active do - if love then - self.Parent.lManager() - else - self.Parent.Do_Order() - end - end - env:Destroy() - self:Resume() - else - print("Error Data Type!!!") - end -end -function multi:oneTime(func,...) - if not(self.Type=="MainInt" or self.Type=="int") then - for _k=1,#self.Parent.Tasks2 do - if self.Parent.Tasks2[_k]==func then - return false - end - end - table.insert(self.Parent.Tasks2,func) - func(...) - return true - else - for _k=1,#self.Tasks2 do - if self.Tasks2[_k]==func then - return false - end - end - table.insert(self.Tasks2,func) - func(...) - return true - end -end ---Constructors -function multi:newEvent(task) - local c=self:newBase() - c.Type="Event" - c.Task=task or function() end - function c:Act() - if self.Task(self) and self.Active==true then - self:Pause() - for _E=1,#self.func do - self.func[_E](self) - end - end - end - function c:OnEvent(func) - table.insert(self.func,func) - end - return c -end -function multi:newAlarm(set) - local c=self:newBase() - c.Type="Alarm" - c.timer=os.clock() - c.set=set or 0 - function c:Act() - if self.Active==true then - if os.clock()-self.timer>=self.set then - self:Pause() - for i=1,#self.func do - self.func[i](self) - end - end - end - end - function c:Reset(n) - if n then self.set=n end - self.timer=os.clock() - self:Resume() - end - function c:OnRing(func) - table.insert(self.func,func) - end - return c -end -function multi:newTask(func) - table.insert(self.Tasks,func) -end -function multi:newLoop(func) - local c=self:newBase() - c.Type="Loop" - if func then - c.func={func} - end - function c:Act() - if self.Active==true then - for i=1,#self.func do - self.func[i](os.clock()-self.Parent.Start,self) - end - end - end - function c:OnLoop(func) - table.insert(self.func,func) - end - return c -end -function multi:newStep(start,reset,count,skip) - local c=self:newBase() - think=1 - c.Type="Step" - c.pos=start or 1 - c.endAt=reset or math.huge - c.skip=skip or 0 - c.spos=0 - c.count=count or 1*think - c.funcE={} - c.start=start or 1 - if start~=nil and reset~=nil then - if start>reset then - think=-1 - end - end - function c:Act() - if self~=nil then - if self.spos==0 then - if self.Active==true then - for i=1,#self.func do - self.func[i](self.pos,self) - end - self.pos=self.pos+self.count - end - end - end - self.spos=self.spos+1 - if self.spos>=self.skip then - self.spos=0 - end - end - function c:OnStep(func) - table.insert(self.func,1,func) - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Update(start,reset,count,skip) - self.start=start or self.start - self.endAt=reset or self.endAt - self.skip=skip or self.skip - self.count=count or self.count - self:Resume() - end - c:OnStep(function(p,s) - if s.count>0 and s.endAt==p then - for fe=1,#s.funcE do - s.funcE[fe](s) - end - s.pos=s.start-1 - elseif s.count<0 and s.endAt==p then - for fe=1,#s.funcE do - s.funcE[fe](s) - end - s.pos=s.start-1 - end - end) - return c -end -function multi:newTStep(start,reset,count,set) - local c=self:newBase() - think=1 - c.Type="TStep" - c.start=start or 1 - local reset = reset or math.huge - c.endAt=reset - c.pos=start or 1 - c.skip=skip or 0 - c.count=count or 1*think - c.funcE={} - c.timer=os.clock() - c.set=set or 1 - function c:Update(start,reset,count,set) - self.start=start or self.start - self.pos=start - self.endAt=reset or self.endAt - self.set=set or self.set - self.count=count or self.count or 1 - self.timer=os.clock() - self:Resume() - end - function c:Act() - if self.Active then - if os.clock()-self.timer>=self.set then - self:Reset() - for i=1,#self.func do - self.func[i](self.pos,self) - end - if self.endAt==self.pos then - for fe=1,#self.funcE do - self.funcE[fe](self) - end - self.pos=self.start-1 - end - self.pos=self.pos+self.count - end - end - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Reset(n) - if n then self.set=n end - self.timer=os.clock() - self:Resume() - end - function c:OnStep(func) - table.insert(self.func,func) - end - return c -end -function multi:newTrigger(func) - local c=self:newBase() - c.Type="Trigger" - c.trigfunc=func or function() end - function c:Fire(...) - self:trigfunc(self,...) - end - return c -end ---Managers -function multi:mainloop() - for i=1,#self.Tasks do - self.Tasks[i](self) - end - self.Start=os.clock() - while self.Active do - self:Do_Order() - end -end -function multi._tFunc(self,dt) - for i=1,#self.Tasks do - self.Tasks[i](self) - end - print("once!") - if dt then - self.pump=true - end - self.pumpvar=dt - self.Start=os.clock() -end -function multi:uManager(dt) - self:oneTime(self._tFunc,self,dt) - self:Do_Order() -end -multi.drawF={} -function multi:dManager() - for ii=1,#multi.drawF do - multi.drawF[ii]() - end -end -function multi:onDraw(func) - table.insert(self.drawF,func) -end -function multi:lManager() - if love.event then - love.event.pump() - for e,a,b,c,d in love.event.poll() do - if e == "quit" then - if not love.quit or not love.quit() then - if love.audio then - love.audio.stop() - end - return nil - end - end - love.handlers[e](a,b,c,d) - end - end - if love.timer then - love.timer.step() - dt = love.timer.getDelta() - end - if love.update then love.update(dt) end - multi:uManager(dt) - if love.window and love.graphics and love.window.isCreated() then - love.graphics.clear() - love.graphics.origin() - if love.draw then love.draw() end - multi.dManager() - love.graphics.setColor(255,255,255,255) - if multi.draw then multi.draw() end - love.graphics.present() - end -end -Thread={} -Thread.Name="Thread 2" -Thread.ChannelThread = love.thread.getChannel("Easy2") -Thread.ChannelMain = love.thread.getChannel("EasyMain") -Thread.Global = {} -function Thread:packTable(G) - function escapeStr(str) - local temp="" - for i=1,#str do - temp=temp.."\\"..string.byte(string.sub(str,i,i)) - end - return temp - end - function ToStr(t) - local dat="{" - for i,v in pairs(t) do - if type(i)=="number" then - i="["..i.."]=" - else - i=i.."=" - end - if type(v)=="string" then - dat=dat..i.."\""..v.."\"," - elseif type(v)=="number" then - dat=dat..i..v.."," - elseif type(v)=="boolean" then - dat=dat..i..tostring(v).."," - elseif type(v)=="table" and not(G==v) then - dat=dat..i..ToStr(v).."," - --elseif type(v)=="table" and G==v then - -- dat=dat..i.."assert(loadstring(\"return self\"))," - elseif type(v)=="function" then - dat=dat..i.."assert(loadstring(\""..escapeStr(string.dump(v)).."\"))," - end - end - return string.sub(dat,1,-2).."}" - end - return "return "..ToStr(G) -end -function Thread:Send(name,var) - arg3="2" - if type(var)=="table" then - var=Thread:packTable(var) - arg3="table" - end - self.ChannelMain:push({name,var,arg3}) -end -function Thread:UnPackChannel() - local c=self.ChannelThread:getCount() - for i=1,c do - local temp=self.ChannelThread:pop() - if temp[1] and temp[2] then - if temp[1]=="func" and type(temp[2])=="string" then - loadstring(temp[2])(temp[3]) - elseif temp[1]=="table" then - _G[temp[3]]=loadstring(temp[2])() - else - _G[temp[1]]=temp[2] - end - end - end - if #multi:getChildren()<2 then - os.sleep(.05) - end -end -function Thread:boost(func,name) - self:Send(name,string.dump(func)) -end -function Thread.mainloop() - Thread:UnPackChannel() -end -Thread.MainThread=false -multi:newLoop():OnLoop(Thread.mainloop) -multi:mainloop() diff --git a/examples/love2d Threading Example/core/T3.lua b/examples/love2d Threading Example/core/T3.lua deleted file mode 100644 index 171eff0..0000000 --- a/examples/love2d Threading Example/core/T3.lua +++ /dev/null @@ -1,596 +0,0 @@ -require("love.timer") -require("love.system") -require("love.sound") -require("love.physics") -require("love.mouse") -require("love.math") -require("love.keyboard") -require("love.joystick") -require("love.image") -require("love.font") -require("love.filesystem") -require("love.event") -require("love.audio") -require("love.graphics") -require("love.window") -_defaultfont = love.graphics.getFont() -gui = {} -function gui.getTile(i,x,y,w,h)-- returns imagedata - if type(i)=="userdata" then - -- do nothing - else - error("getTile invalid args!!! Usage: ImageElement:getTile(x,y,w,h) or gui:getTile(imagedata,x,y,w,h)") - end - local iw,ih=i:getDimensions() - local id,_id=i:getData(),love.image.newImageData(w,h) - for _x=x,w+x-1 do - for _y=y,h+y-1 do - _id:setPixel(_x-x,_y-y,id:getPixel(_x,_y)) - end - end - return love.graphics.newImage(_id) -end -multi = {} -multi.Version="4.0.0" -multi.__index = multi -multi.Mainloop={} -multi.Tasks={} -multi.Tasks2={} -multi.Garbage={} -multi.Children={} -multi.Paused={} -multi.MasterId=0 -multi.Active=true -multi.Id=-1 -multi.Type="MainInt" -multi.Rest=0 --- System -os.sleep=love.timer.sleep -function multi:newBase(ins) - if not(self.Type=="MainInt" or self.Type=="int") then error("Can only create an object on multi or an interface obj") return false end - local c = {} - if self.Type=="int" then - setmetatable(c, self.Parent) - else - setmetatable(c, self) - end - c.Active=true - c.func={} - c.Id=0 - c.Act=function() end - c.Parent=self - if ins then - table.insert(self.Mainloop,ins,c) - else - table.insert(self.Mainloop,c) - end - self.MasterId=self.MasterId+1 - return c -end -function multi:reboot(r) - self.Mainloop={} - self.Tasks={} - self.Tasks2={} - self.Garbage={} - self.Children={} - self.Paused={} - self.MasterId=0 - self.Active=true - self.Id=-1 - if r then - for i,v in pairs(_G) do - if type(i)=="table" then - if i.Parent and i.Id and i.Act then - i={} - end - end - end - end -end -function multi:getChildren() - return self.Mainloop -end ---Processor -function multi:Do_Order() - for _D=#self.Mainloop,1,-1 do - if self.Mainloop[_D]~=nil then - self.Mainloop[_D].Id=_D - self.Mainloop[_D]:Act() - end - if self.Mainloop[_D].rem then - table.remove(self.Mainloop,_D) - end - end - if self.Rest>0 then - os.sleep(self.Rest) - end -end -function multi:benchMark(sec) - local temp=self:newLoop(function(t,self) - if os.clock()-self.init>self.sec then - print(self.c.." steps in "..self.sec.." second(s)") - self.tt(self.sec) - self:Destroy() - else - self.c=self.c+1 - end - end) - function temp:OnBench(func) - self.tt=func - end - self.tt=function() end - temp.sec=sec - temp.init=os.clock() - temp.c=0 - return temp -end -function multi:newInterface() - if not(self.Type=="MainInt") then error("Can only create an interface on the multi obj") return false end - local c = {} - setmetatable(c, self) - c.Parent=self - c.Active=true - c.func={} - c.Id=0 - c.Type="int" - c.Mainloop={} - c.Tasks={} - c.Tasks2={} - c.Garbage={} - c.Children={} - c.Paused={} - c.MasterId=0 - c.Active=true - c.Id=-1 - c.Rest=0 - function c:Start() - if self.l then - self.l:Resume() - else - self.l=self.Parent:newLoop(function(dt) c:uManager(dt) end) - end - end - function c:Stop() - if self.l then - self.l:Pause() - end - end - function c:Remove() - self:Destroy() - self.l:Destroy() - end - return c -end ---Helpers -function multi:FreeMainEvent() - self.func={} -end -function multi:isPaused() - return not(self.Active) -end -function multi:Pause(n) - if self.Type=="int" or self.Type=="MainInt" then - self.Active=false - if not(n) then - local c=self:getChildren() - for i=1,#c do - c[i]:Pause() - end - else - self:hold(n) - end - else - if not(n) then - self.Active=false - if self.Parent.Mainloop[self.Id]~=nil then - table.remove(self.Parent.Mainloop,self.Id) - table.insert(self.Parent.Paused,self) - self.Id=#self.Parent.Paused - end - else - self:hold(n) - end - end -end -function multi:Resume() - if self.Type=="int" or self.Type=="MainInt" then - self.Active=true - local c=self:getChildren() - for i=1,#c do - c[i]:Resume() - end - else - if self:isPaused() then - self.Active=true - for i=1,#self.Parent.Paused do - if self.Parent.Paused[i]==self then - table.remove(self.Parent.Paused,i) - return - end - end - table.insert(self.Parent.Mainloop,self) - end - end -end -function multi:Destroy() - if self.Type=="int" or self.Type=="MainInt" then - local c=self:getChildren() - for i=1,#c do - c[i]:Destroy() - end - else - self.rem=true - end -end -function multi:hold(task) - self:Pause() - if type(task)=="number" then - local alarm=self:newAlarm(task) - while alarm.Active==true do - if love then - self.Parent.lManager() - else - self.Parent.Do_Order() - end - end - alarm:Destroy() - self:Resume() - elseif type(task)=="function" then - local env=self.Parent:newEvent(task) - env:OnEvent(function(envt) envt:Pause() envt:Stop() end) - while env.Active do - if love then - self.Parent.lManager() - else - self.Parent.Do_Order() - end - end - env:Destroy() - self:Resume() - else - print("Error Data Type!!!") - end -end -function multi:oneTime(func,...) - if not(self.Type=="MainInt" or self.Type=="int") then - for _k=1,#self.Parent.Tasks2 do - if self.Parent.Tasks2[_k]==func then - return false - end - end - table.insert(self.Parent.Tasks2,func) - func(...) - return true - else - for _k=1,#self.Tasks2 do - if self.Tasks2[_k]==func then - return false - end - end - table.insert(self.Tasks2,func) - func(...) - return true - end -end ---Constructors -function multi:newEvent(task) - local c=self:newBase() - c.Type="Event" - c.Task=task or function() end - function c:Act() - if self.Task(self) and self.Active==true then - self:Pause() - for _E=1,#self.func do - self.func[_E](self) - end - end - end - function c:OnEvent(func) - table.insert(self.func,func) - end - return c -end -function multi:newAlarm(set) - local c=self:newBase() - c.Type="Alarm" - c.timer=os.clock() - c.set=set or 0 - function c:Act() - if self.Active==true then - if os.clock()-self.timer>=self.set then - self:Pause() - for i=1,#self.func do - self.func[i](self) - end - end - end - end - function c:Reset(n) - if n then self.set=n end - self.timer=os.clock() - self:Resume() - end - function c:OnRing(func) - table.insert(self.func,func) - end - return c -end -function multi:newTask(func) - table.insert(self.Tasks,func) -end -function multi:newLoop(func) - local c=self:newBase() - c.Type="Loop" - if func then - c.func={func} - end - function c:Act() - if self.Active==true then - for i=1,#self.func do - self.func[i](os.clock()-self.Parent.Start,self) - end - end - end - function c:OnLoop(func) - table.insert(self.func,func) - end - return c -end -function multi:newStep(start,reset,count,skip) - local c=self:newBase() - think=1 - c.Type="Step" - c.pos=start or 1 - c.endAt=reset or math.huge - c.skip=skip or 0 - c.spos=0 - c.count=count or 1*think - c.funcE={} - c.start=start or 1 - if start~=nil and reset~=nil then - if start>reset then - think=-1 - end - end - function c:Act() - if self~=nil then - if self.spos==0 then - if self.Active==true then - for i=1,#self.func do - self.func[i](self.pos,self) - end - self.pos=self.pos+self.count - end - end - end - self.spos=self.spos+1 - if self.spos>=self.skip then - self.spos=0 - end - end - function c:OnStep(func) - table.insert(self.func,1,func) - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Update(start,reset,count,skip) - self.start=start or self.start - self.endAt=reset or self.endAt - self.skip=skip or self.skip - self.count=count or self.count - self:Resume() - end - c:OnStep(function(p,s) - if s.count>0 and s.endAt==p then - for fe=1,#s.funcE do - s.funcE[fe](s) - end - s.pos=s.start-1 - elseif s.count<0 and s.endAt==p then - for fe=1,#s.funcE do - s.funcE[fe](s) - end - s.pos=s.start-1 - end - end) - return c -end -function multi:newTStep(start,reset,count,set) - local c=self:newBase() - think=1 - c.Type="TStep" - c.start=start or 1 - local reset = reset or math.huge - c.endAt=reset - c.pos=start or 1 - c.skip=skip or 0 - c.count=count or 1*think - c.funcE={} - c.timer=os.clock() - c.set=set or 1 - function c:Update(start,reset,count,set) - self.start=start or self.start - self.pos=start - self.endAt=reset or self.endAt - self.set=set or self.set - self.count=count or self.count or 1 - self.timer=os.clock() - self:Resume() - end - function c:Act() - if self.Active then - if os.clock()-self.timer>=self.set then - self:Reset() - for i=1,#self.func do - self.func[i](self.pos,self) - end - if self.endAt==self.pos then - for fe=1,#self.funcE do - self.funcE[fe](self) - end - self.pos=self.start-1 - end - self.pos=self.pos+self.count - end - end - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Reset(n) - if n then self.set=n end - self.timer=os.clock() - self:Resume() - end - function c:OnStep(func) - table.insert(self.func,func) - end - return c -end -function multi:newTrigger(func) - local c=self:newBase() - c.Type="Trigger" - c.trigfunc=func or function() end - function c:Fire(...) - self:trigfunc(self,...) - end - return c -end ---Managers -function multi:mainloop() - for i=1,#self.Tasks do - self.Tasks[i](self) - end - self.Start=os.clock() - while self.Active do - self:Do_Order() - end -end -function multi._tFunc(self,dt) - for i=1,#self.Tasks do - self.Tasks[i](self) - end - print("once!") - if dt then - self.pump=true - end - self.pumpvar=dt - self.Start=os.clock() -end -function multi:uManager(dt) - self:oneTime(self._tFunc,self,dt) - self:Do_Order() -end -multi.drawF={} -function multi:dManager() - for ii=1,#multi.drawF do - multi.drawF[ii]() - end -end -function multi:onDraw(func) - table.insert(self.drawF,func) -end -function multi:lManager() - if love.event then - love.event.pump() - for e,a,b,c,d in love.event.poll() do - if e == "quit" then - if not love.quit or not love.quit() then - if love.audio then - love.audio.stop() - end - return nil - end - end - love.handlers[e](a,b,c,d) - end - end - if love.timer then - love.timer.step() - dt = love.timer.getDelta() - end - if love.update then love.update(dt) end - multi:uManager(dt) - if love.window and love.graphics and love.window.isCreated() then - love.graphics.clear() - love.graphics.origin() - if love.draw then love.draw() end - multi.dManager() - love.graphics.setColor(255,255,255,255) - if multi.draw then multi.draw() end - love.graphics.present() - end -end -Thread={} -Thread.Name="Thread 3" -Thread.ChannelThread = love.thread.getChannel("Easy3") -Thread.ChannelMain = love.thread.getChannel("EasyMain") -Thread.Global = {} -function Thread:packTable(G) - function escapeStr(str) - local temp="" - for i=1,#str do - temp=temp.."\\"..string.byte(string.sub(str,i,i)) - end - return temp - end - function ToStr(t) - local dat="{" - for i,v in pairs(t) do - if type(i)=="number" then - i="["..i.."]=" - else - i=i.."=" - end - if type(v)=="string" then - dat=dat..i.."\""..v.."\"," - elseif type(v)=="number" then - dat=dat..i..v.."," - elseif type(v)=="boolean" then - dat=dat..i..tostring(v).."," - elseif type(v)=="table" and not(G==v) then - dat=dat..i..ToStr(v).."," - --elseif type(v)=="table" and G==v then - -- dat=dat..i.."assert(loadstring(\"return self\"))," - elseif type(v)=="function" then - dat=dat..i.."assert(loadstring(\""..escapeStr(string.dump(v)).."\"))," - end - end - return string.sub(dat,1,-2).."}" - end - return "return "..ToStr(G) -end -function Thread:Send(name,var) - arg3="3" - if type(var)=="table" then - var=Thread:packTable(var) - arg3="table" - end - self.ChannelMain:push({name,var,arg3}) -end -function Thread:UnPackChannel() - local c=self.ChannelThread:getCount() - for i=1,c do - local temp=self.ChannelThread:pop() - if temp[1] and temp[2] then - if temp[1]=="func" and type(temp[2])=="string" then - loadstring(temp[2])(temp[3]) - else - _G[temp[1]]=temp[2] - end - end - end - if #multi:getChildren()<2 then - os.sleep(.05) - end -end -function Thread:boost(func,name) - self:Send(name,string.dump(func)) -end -function Thread.mainloop() - Thread:UnPackChannel() -end -Thread.MainThread=false -multi:newLoop():OnLoop(Thread.mainloop) -multi:mainloop() diff --git a/examples/love2d Threading Example/core/T4.lua b/examples/love2d Threading Example/core/T4.lua deleted file mode 100644 index a8d3203..0000000 --- a/examples/love2d Threading Example/core/T4.lua +++ /dev/null @@ -1,596 +0,0 @@ -require("love.timer") -require("love.system") -require("love.sound") -require("love.physics") -require("love.mouse") -require("love.math") -require("love.keyboard") -require("love.joystick") -require("love.image") -require("love.font") -require("love.filesystem") -require("love.event") -require("love.audio") -require("love.graphics") -require("love.window") -_defaultfont = love.graphics.getFont() -gui = {} -function gui.getTile(i,x,y,w,h)-- returns imagedata - if type(i)=="userdata" then - -- do nothing - else - error("getTile invalid args!!! Usage: ImageElement:getTile(x,y,w,h) or gui:getTile(imagedata,x,y,w,h)") - end - local iw,ih=i:getDimensions() - local id,_id=i:getData(),love.image.newImageData(w,h) - for _x=x,w+x-1 do - for _y=y,h+y-1 do - _id:setPixel(_x-x,_y-y,id:getPixel(_x,_y)) - end - end - return love.graphics.newImage(_id) -end -multi = {} -multi.Version="4.0.0" -multi.__index = multi -multi.Mainloop={} -multi.Tasks={} -multi.Tasks2={} -multi.Garbage={} -multi.Children={} -multi.Paused={} -multi.MasterId=0 -multi.Active=true -multi.Id=-1 -multi.Type="MainInt" -multi.Rest=0 --- System -os.sleep=love.timer.sleep -function multi:newBase(ins) - if not(self.Type=="MainInt" or self.Type=="int") then error("Can only create an object on multi or an interface obj") return false end - local c = {} - if self.Type=="int" then - setmetatable(c, self.Parent) - else - setmetatable(c, self) - end - c.Active=true - c.func={} - c.Id=0 - c.Act=function() end - c.Parent=self - if ins then - table.insert(self.Mainloop,ins,c) - else - table.insert(self.Mainloop,c) - end - self.MasterId=self.MasterId+1 - return c -end -function multi:reboot(r) - self.Mainloop={} - self.Tasks={} - self.Tasks2={} - self.Garbage={} - self.Children={} - self.Paused={} - self.MasterId=0 - self.Active=true - self.Id=-1 - if r then - for i,v in pairs(_G) do - if type(i)=="table" then - if i.Parent and i.Id and i.Act then - i={} - end - end - end - end -end -function multi:getChildren() - return self.Mainloop -end ---Processor -function multi:Do_Order() - for _D=#self.Mainloop,1,-1 do - if self.Mainloop[_D]~=nil then - self.Mainloop[_D].Id=_D - self.Mainloop[_D]:Act() - end - if self.Mainloop[_D].rem then - table.remove(self.Mainloop,_D) - end - end - if self.Rest>0 then - os.sleep(self.Rest) - end -end -function multi:benchMark(sec) - local temp=self:newLoop(function(t,self) - if os.clock()-self.init>self.sec then - print(self.c.." steps in "..self.sec.." second(s)") - self.tt(self.sec) - self:Destroy() - else - self.c=self.c+1 - end - end) - function temp:OnBench(func) - self.tt=func - end - self.tt=function() end - temp.sec=sec - temp.init=os.clock() - temp.c=0 - return temp -end -function multi:newInterface() - if not(self.Type=="MainInt") then error("Can only create an interface on the multi obj") return false end - local c = {} - setmetatable(c, self) - c.Parent=self - c.Active=true - c.func={} - c.Id=0 - c.Type="int" - c.Mainloop={} - c.Tasks={} - c.Tasks2={} - c.Garbage={} - c.Children={} - c.Paused={} - c.MasterId=0 - c.Active=true - c.Id=-1 - c.Rest=0 - function c:Start() - if self.l then - self.l:Resume() - else - self.l=self.Parent:newLoop(function(dt) c:uManager(dt) end) - end - end - function c:Stop() - if self.l then - self.l:Pause() - end - end - function c:Remove() - self:Destroy() - self.l:Destroy() - end - return c -end ---Helpers -function multi:FreeMainEvent() - self.func={} -end -function multi:isPaused() - return not(self.Active) -end -function multi:Pause(n) - if self.Type=="int" or self.Type=="MainInt" then - self.Active=false - if not(n) then - local c=self:getChildren() - for i=1,#c do - c[i]:Pause() - end - else - self:hold(n) - end - else - if not(n) then - self.Active=false - if self.Parent.Mainloop[self.Id]~=nil then - table.remove(self.Parent.Mainloop,self.Id) - table.insert(self.Parent.Paused,self) - self.Id=#self.Parent.Paused - end - else - self:hold(n) - end - end -end -function multi:Resume() - if self.Type=="int" or self.Type=="MainInt" then - self.Active=true - local c=self:getChildren() - for i=1,#c do - c[i]:Resume() - end - else - if self:isPaused() then - self.Active=true - for i=1,#self.Parent.Paused do - if self.Parent.Paused[i]==self then - table.remove(self.Parent.Paused,i) - return - end - end - table.insert(self.Parent.Mainloop,self) - end - end -end -function multi:Destroy() - if self.Type=="int" or self.Type=="MainInt" then - local c=self:getChildren() - for i=1,#c do - c[i]:Destroy() - end - else - self.rem=true - end -end -function multi:hold(task) - self:Pause() - if type(task)=="number" then - local alarm=self:newAlarm(task) - while alarm.Active==true do - if love then - self.Parent.lManager() - else - self.Parent.Do_Order() - end - end - alarm:Destroy() - self:Resume() - elseif type(task)=="function" then - local env=self.Parent:newEvent(task) - env:OnEvent(function(envt) envt:Pause() envt:Stop() end) - while env.Active do - if love then - self.Parent.lManager() - else - self.Parent.Do_Order() - end - end - env:Destroy() - self:Resume() - else - print("Error Data Type!!!") - end -end -function multi:oneTime(func,...) - if not(self.Type=="MainInt" or self.Type=="int") then - for _k=1,#self.Parent.Tasks2 do - if self.Parent.Tasks2[_k]==func then - return false - end - end - table.insert(self.Parent.Tasks2,func) - func(...) - return true - else - for _k=1,#self.Tasks2 do - if self.Tasks2[_k]==func then - return false - end - end - table.insert(self.Tasks2,func) - func(...) - return true - end -end ---Constructors -function multi:newEvent(task) - local c=self:newBase() - c.Type="Event" - c.Task=task or function() end - function c:Act() - if self.Task(self) and self.Active==true then - self:Pause() - for _E=1,#self.func do - self.func[_E](self) - end - end - end - function c:OnEvent(func) - table.insert(self.func,func) - end - return c -end -function multi:newAlarm(set) - local c=self:newBase() - c.Type="Alarm" - c.timer=os.clock() - c.set=set or 0 - function c:Act() - if self.Active==true then - if os.clock()-self.timer>=self.set then - self:Pause() - for i=1,#self.func do - self.func[i](self) - end - end - end - end - function c:Reset(n) - if n then self.set=n end - self.timer=os.clock() - self:Resume() - end - function c:OnRing(func) - table.insert(self.func,func) - end - return c -end -function multi:newTask(func) - table.insert(self.Tasks,func) -end -function multi:newLoop(func) - local c=self:newBase() - c.Type="Loop" - if func then - c.func={func} - end - function c:Act() - if self.Active==true then - for i=1,#self.func do - self.func[i](os.clock()-self.Parent.Start,self) - end - end - end - function c:OnLoop(func) - table.insert(self.func,func) - end - return c -end -function multi:newStep(start,reset,count,skip) - local c=self:newBase() - think=1 - c.Type="Step" - c.pos=start or 1 - c.endAt=reset or math.huge - c.skip=skip or 0 - c.spos=0 - c.count=count or 1*think - c.funcE={} - c.start=start or 1 - if start~=nil and reset~=nil then - if start>reset then - think=-1 - end - end - function c:Act() - if self~=nil then - if self.spos==0 then - if self.Active==true then - for i=1,#self.func do - self.func[i](self.pos,self) - end - self.pos=self.pos+self.count - end - end - end - self.spos=self.spos+1 - if self.spos>=self.skip then - self.spos=0 - end - end - function c:OnStep(func) - table.insert(self.func,1,func) - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Update(start,reset,count,skip) - self.start=start or self.start - self.endAt=reset or self.endAt - self.skip=skip or self.skip - self.count=count or self.count - self:Resume() - end - c:OnStep(function(p,s) - if s.count>0 and s.endAt==p then - for fe=1,#s.funcE do - s.funcE[fe](s) - end - s.pos=s.start-1 - elseif s.count<0 and s.endAt==p then - for fe=1,#s.funcE do - s.funcE[fe](s) - end - s.pos=s.start-1 - end - end) - return c -end -function multi:newTStep(start,reset,count,set) - local c=self:newBase() - think=1 - c.Type="TStep" - c.start=start or 1 - local reset = reset or math.huge - c.endAt=reset - c.pos=start or 1 - c.skip=skip or 0 - c.count=count or 1*think - c.funcE={} - c.timer=os.clock() - c.set=set or 1 - function c:Update(start,reset,count,set) - self.start=start or self.start - self.pos=start - self.endAt=reset or self.endAt - self.set=set or self.set - self.count=count or self.count or 1 - self.timer=os.clock() - self:Resume() - end - function c:Act() - if self.Active then - if os.clock()-self.timer>=self.set then - self:Reset() - for i=1,#self.func do - self.func[i](self.pos,self) - end - if self.endAt==self.pos then - for fe=1,#self.funcE do - self.funcE[fe](self) - end - self.pos=self.start-1 - end - self.pos=self.pos+self.count - end - end - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Reset(n) - if n then self.set=n end - self.timer=os.clock() - self:Resume() - end - function c:OnStep(func) - table.insert(self.func,func) - end - return c -end -function multi:newTrigger(func) - local c=self:newBase() - c.Type="Trigger" - c.trigfunc=func or function() end - function c:Fire(...) - self:trigfunc(self,...) - end - return c -end ---Managers -function multi:mainloop() - for i=1,#self.Tasks do - self.Tasks[i](self) - end - self.Start=os.clock() - while self.Active do - self:Do_Order() - end -end -function multi._tFunc(self,dt) - for i=1,#self.Tasks do - self.Tasks[i](self) - end - print("once!") - if dt then - self.pump=true - end - self.pumpvar=dt - self.Start=os.clock() -end -function multi:uManager(dt) - self:oneTime(self._tFunc,self,dt) - self:Do_Order() -end -multi.drawF={} -function multi:dManager() - for ii=1,#multi.drawF do - multi.drawF[ii]() - end -end -function multi:onDraw(func) - table.insert(self.drawF,func) -end -function multi:lManager() - if love.event then - love.event.pump() - for e,a,b,c,d in love.event.poll() do - if e == "quit" then - if not love.quit or not love.quit() then - if love.audio then - love.audio.stop() - end - return nil - end - end - love.handlers[e](a,b,c,d) - end - end - if love.timer then - love.timer.step() - dt = love.timer.getDelta() - end - if love.update then love.update(dt) end - multi:uManager(dt) - if love.window and love.graphics and love.window.isCreated() then - love.graphics.clear() - love.graphics.origin() - if love.draw then love.draw() end - multi.dManager() - love.graphics.setColor(255,255,255,255) - if multi.draw then multi.draw() end - love.graphics.present() - end -end -Thread={} -Thread.Name="Thread 4" -Thread.ChannelThread = love.thread.getChannel("Easy4") -Thread.ChannelMain = love.thread.getChannel("EasyMain") -Thread.Global = {} -function Thread:packTable(G) - function escapeStr(str) - local temp="" - for i=1,#str do - temp=temp.."\\"..string.byte(string.sub(str,i,i)) - end - return temp - end - function ToStr(t) - local dat="{" - for i,v in pairs(t) do - if type(i)=="number" then - i="["..i.."]=" - else - i=i.."=" - end - if type(v)=="string" then - dat=dat..i.."\""..v.."\"," - elseif type(v)=="number" then - dat=dat..i..v.."," - elseif type(v)=="boolean" then - dat=dat..i..tostring(v).."," - elseif type(v)=="table" and not(G==v) then - dat=dat..i..ToStr(v).."," - --elseif type(v)=="table" and G==v then - -- dat=dat..i.."assert(loadstring(\"return self\"))," - elseif type(v)=="function" then - dat=dat..i.."assert(loadstring(\""..escapeStr(string.dump(v)).."\"))," - end - end - return string.sub(dat,1,-2).."}" - end - return "return "..ToStr(G) -end -function Thread:Send(name,var) - arg3="4" - if type(var)=="table" then - var=Thread:packTable(var) - arg3="table" - end - self.ChannelMain:push({name,var,arg3}) -end -function Thread:UnPackChannel() - local c=self.ChannelThread:getCount() - for i=1,c do - local temp=self.ChannelThread:pop() - if temp[1] and temp[2] then - if temp[1]=="func" and type(temp[2])=="string" then - loadstring(temp[2])(temp[3]) - else - _G[temp[1]]=temp[2] - end - end - end - if #multi:getChildren()<2 then - os.sleep(.05) - end -end -function Thread:boost(func,name) - self:Send(name,string.dump(func)) -end -function Thread.mainloop() - Thread:UnPackChannel() -end -Thread.MainThread=false -multi:newLoop():OnLoop(Thread.mainloop) -multi:mainloop() diff --git a/examples/love2d Threading Example/core/ThreadManager.lua b/examples/love2d Threading Example/core/ThreadManager.lua deleted file mode 100644 index de6434d..0000000 --- a/examples/love2d Threading Example/core/ThreadManager.lua +++ /dev/null @@ -1,158 +0,0 @@ -Thread={} -Thread.ChannelT1 = love.thread.getChannel("Easy1") -Thread.ChannelT2 = love.thread.getChannel("Easy2") -Thread.ChannelT3 = love.thread.getChannel("Easy3") -Thread.ChannelT4 = love.thread.getChannel("Easy4") -Thread.ChannelMain = love.thread.getChannel("EasyMain") -Thread.Name = "Thread Main" -Thread.n=0 -Thread.count=1 -function Thread:packTable(G) - function escapeStr(str) - local temp="" - for i=1,#str do - temp=temp.."\\"..string.byte(string.sub(str,i,i)) - end - return temp - end - function ToStr(t) - local dat="{" - for i,v in pairs(t) do - if type(i)=="number" then - i="["..i.."]=" - else - i=i.."=" - end - if type(v)=="string" then - dat=dat..i.."\""..v.."\"," - elseif type(v)=="number" then - dat=dat..i..v.."," - elseif type(v)=="boolean" then - dat=dat..i..tostring(v).."," - elseif type(v)=="table" and not(G==v) then - dat=dat..i..bin.ToStr(v).."," - --elseif type(v)=="table" and G==v then - -- dat=dat..i.."assert(loadstring(\"return self\"))," - elseif type(v)=="function" then - dat=dat..i.."assert(loadstring(\""..escapeStr(string.dump(v)).."\"))," - end - end - return string.sub(dat,1,-2).."}" - end - return ToStr(G) -end -Thread.last={} -function Thread:GetStatus() - print(self.n.." Threads Exist!!!") - for i=1,self.n do - print("\tThread "..i.." Running: "..tostring(self["Thread"..i]:isRunning())) - if not(self["Thread"..i]:isRunning()) then - print("\t\t"..self["Thread"..i]:getError()) - end - end -end -function Thread:Start(n) - local x=love.system.getProcessorCount() - if x>1 then - x=x-1 - else - x=1 - end - n=n or x - if n<1 then - print("Must be atleast 1 thread running!!!") - return - end - if n>4 then - print("Must be no more than 4 threads running!!!") - return - end - for i=1,n do - self["Thread"..i]=love.thread.newThread("Libs/T"..i..".lua") - self["Thread"..i]:start() - end - Thread.n=n -end -function Thread:RestartBroken() - for i=1,self.n do - if self["Thread"..i]:isRunning()==false then - self["Thread"..i]:start() - end - Thread:Boost(Thread.last[1],Thread.last[2]) - end -end -function Thread:Send(name,var,arg3) - if self.n>0 then - if type(var)=="table" then - var=Thread:packTable(var) - arg3=name - name="table" - end - self["ChannelT"..((self.count-1)%self.n)+1]:push({name,var,arg3}) - self.count=self.count+1 - end -end -function Thread:SendAll(name,var,arg3) - if self.n>0 then - for i=1,self.n do - if type(var)=="table" then - var=Thread:packTable(var) - arg3=name - name="table" - end - self["ChannelT"..i]:push({name,var,arg3}) - end - end -end -function Thread:UnPackChannel() - local c=self.ChannelMain:getCount() - for i=1,c do - local temp=self.ChannelMain:pop() - if temp[3]=="table" then - _G[temp[1]]=assert(loadstring(temp[2]))() - else - if Thread.OnDataRecieved then - Thread.OnDataRecieved(temp[1],temp[2],temp[3]) - end - _G[temp[1]]=temp[2] - end - end -end -function Thread:Boost(func,name) - if Thread.last[1]==nil then - return - end - Thread.last={func,name} - name=name or "nil" - if self.n>0 then - self:Send("func",string.dump(func),name) - end -end -function Thread:SendLibs(func,name) - name=name or "nil" - if self.n>0 then - self:SendAll("func",string.dump(func),name) - end -end -function Thread.mainloop() - if Thread.n>0 then - Thread:UnPackChannel() - end -end -Thread.MainThread=true -local loop = multi:newLoop() -loop:OnLoop(Thread.mainloop) -OnThreadError=multi:newConnection() -function love.threaderror(thread, errorstr) - Thread:GetStatus() - Thread:RestartBroken() - Thread:GetStatus() - OnThreadError:Fire(thread,errorstr) -end -multi:newTask(function() - math.randomseed(math.floor(os.time()/2)) - for i=1,Thread.n do - Thread["ChannelT"..i]:push({"randseed",math.random(-1000000,1000000)}) - Thread["ChannelT"..i]:push({"func",string.dump(function() math.randomseed(randseed) end),"randomizing"}) - end -end) diff --git a/examples/love2d Threading Example/core/Utils.lua b/examples/love2d Threading Example/core/Utils.lua deleted file mode 100644 index c80b4bc..0000000 --- a/examples/love2d Threading Example/core/Utils.lua +++ /dev/null @@ -1,797 +0,0 @@ --- os Additions -function os.getSystemBit() - if (os.getenv('PROCESSOR_ARCHITEW6432')=='AMD64' or os.getenv('PROCESSOR_ARCHITECTURE')=='AMD64') then - return 64 - else - return 32 - end -end -function os.sleep(n) - if not n then n=0 end - local t0 = os.clock() - while os.clock() - t0 <= n do end -end -function os.pause(msg) - if msg ~= nil then - print(msg) - end - io.read() -end -function os.batCmd(cmd) - io.mkFile('temp.bat',cmd) - local temp = os.execute([[temp.bat]]) - io.delFile('temp.bat') - return temp -end -function os._getOS() - if package.config:sub(1,1)=='\\' then - return 'windows' - else - return 'unix' - end -end -function os.getOS(t) - if not t then - return os._getOS() - end - if os._getOS()=='unix' then - fh,err = io.popen('uname -o 2>/dev/null','r') - if fh then - osname = fh:read() - end - if osname then return osname end - end - local winver='Unknown Version' - local a,b,c=os.capture('ver'):match('(%d+).(%d+).(%d+)') - local win=a..'.'..b..'.'..c - if type(t)=='string' then - win=t - end - if win=='4.00.950' then - winver='95' - elseif win=='4.00.1111' then - winver='95 OSR2' - elseif win=='4.00.1381' then - winver='NT 4.0' - elseif win=='4.10.1998' then - winver='98' - elseif win=='4.10.2222' then - winver='98 SE' - elseif win=='4.90.3000' then - winver='ME' - elseif win=='5.00.2195' then - winver='2000' - elseif win=='5.1.2600' then - winver='XP' - elseif win=='5.2.3790' then - winver='Server 2003' - elseif win=='6.0.6000' then - winver='Vista/Windows Server 2008' - elseif win=='6.0.6002' then - winver='Vista SP2' - elseif win=='6.1.7600' then - winver='7/Windows Server 2008 R2' - elseif win=='6.1.7601' then - winver='7 SP1/Windows Server 2008 R2 SP1' - elseif win=='6.2.9200' then - winver='8/Windows Server 2012' - elseif win=='6.3.9600' then - winver='8.1/Windows Server 2012' - elseif win=='6.4.9841' then - winver='10 Technical Preview 1' - elseif win=='6.4.9860' then - winver='10 Technical Preview 2' - elseif win=='6.4.9879' then - winver='10 Technical Preview 3' - elseif win=='10.0.9926' then - winver='10 Technical Preview 4' - end - return 'Windows '..winver -end -function os.getLuaArch() - return (#tostring({})-7)*4 -end -if os.getOS()=='windows' then - function os.sleep(n) - if n > 0 then os.execute('ping -n ' .. tonumber(n+1) .. ' localhost > NUL') end - end -else - function os.sleep(n) - os.execute('sleep ' .. tonumber(n)) - end -end -function os.capture(cmd, raw) - local f = assert(io.popen(cmd, 'r')) - local s = assert(f:read('*a')) - f:close() - if raw then return s end - s = string.gsub(s, '^%s+', '') - s = string.gsub(s, '%s+$', '') - s = string.gsub(s, '[\n\r]+', ' ') - return s -end -function os.getCurrentUser() - return os.getenv('$USER') or os.getenv('USERNAME') -end --- string Additions -function string.trim(s) - local from = s:match"^%s*()" - return from > #s and "" or s:match(".*%S", from) -end -function string.random(n) - local str = '' - strings = {'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','1','2','3','4','5','6','7','8','9','0','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'} - for i=1,n do - h = math.random(1,#strings) - str = str..''..strings[h] - end - return str -end -function string.linesToTable(s) - local t = {} - local i = 0 - while true do - i = string.find(s, '\n', i+1) - if i == nil then return t end - table.insert(t, i) - end -end -function string.lines(str) - local t = {} - local function helper(line) table.insert(t, line) return '' end - helper((str:gsub('(.-)\r?\n', helper))) - return t -end -function string.split(str, pat) - local t = {} -- NOTE: use {n = 0} in Lua-5.0 - local fpat = '(.-)' .. pat - local last_end = 1 - local s, e, cap = str:find(fpat, 1) - while s do - if s ~= 1 or cap ~= '' then - table.insert(t,cap) - end - last_end = e+1 - s, e, cap = str:find(fpat, last_end) - end - if last_end <= #str then - cap = str:sub(last_end) - table.insert(t, cap) - end - return t -end -function string.shuffle(inputStr) - math.randomseed(os.time()); - local outputStr = ''; - local strLength = string.len(inputStr); - while (strLength ~=0) do - local pos = math.random(strLength); - outputStr = outputStr..string.sub(inputStr,pos,pos); - inputStr = inputStr:sub(1, pos-1) .. inputStr:sub(pos+1); - strLength = string.len(inputStr); - end - return outputStr; -end -function string.genKeys(chars,a,f,s,GG) - if GG then - chars=string.rep(chars,a) - end - if s then - chars=string.shuffle(chars) - end - b=#chars - if a==0 then return end - local taken = {} local slots = {} - for i=1,a do slots[i]=0 end - for i=1,b do taken[i]=false end - local index = 1 - local tab={} - for i=1,#chars do - table.insert(tab,chars:sub(i,i)) - end - while index > 0 do repeat - repeat slots[index] = slots[index] + 1 - until slots[index] > b or not taken[slots[index]] - if slots[index] > b then - slots[index] = 0 - index = index - 1 - if index > 0 then - taken[slots[index]] = false - end - break - else - taken[slots[index]] = true - end - if index == a then - local tt={} - for i=1,a do - table.insert(tt,tab[slots[i]]) - end - f(table.concat(tt)) - taken[slots[index]] = false - break - end - index = index + 1 - until true end -end --- io Additions -function io.getInput(msg) - if msg ~= nil then - io.write(msg) - end - return io.read() -end -function io.scanDir(directory) - directory=directory or io.getDir() - local i, t, popen = 0, {}, io.popen - if os.getOS()=='unix' then - for filename in popen('ls -a \''..directory..'\''):lines() do - i = i + 1 - t[i] = filename - end - else - for filename in popen('dir \''..directory..'\' /b'):lines() do - i = i + 1 - t[i] = filename - end - end - return t -end -function io.buildFromTree(tbl, indent,folder) - if not indent then indent = 0 end - if not folder then folder = '' end - for k, v in pairs(tbl) do - formatting = string.rep(' ', indent) .. k .. ':' - if type(v) == 'table' then - if not(io.dirExists(folder..string.sub(formatting,1,-2))) then - io.mkDir(folder..string.sub(formatting,1,-2)) - end - io.buildFromTree(v,0,folder..string.sub(formatting,1,-2)..'\\') - else - a=string.find(tostring(v),':',1,true) - if a then - file=string.sub(tostring(v),1,a-1) - data=string.sub(tostring(v),a+1) - io.mkFile(folder..file,data,'wb') - else - io.mkFile(folder..v,'','wb') - end - end - end -end -function io.cpFile(path,topath) - if os.getOS()=='unix' then - os.execute('cp '..file1..' '..file2) - else - os.execute('Copy '..path..' '..topath) - end -end -function io.delDir(directoryname) - if os.getOS()=='unix' then - os.execute('rm -rf '..directoryname) - else - os.execute('rmdir '..directoryname..' /s /q') - end -end -function io.delFile(path) - os.remove(path) -end -function io.mkDir(dirname) - os.execute('mkdir "' .. dirname..'"') -end -function io.mkFile(filename,data,tp) - if not(tp) then tp='wb' end - if not(data) then data='' end - file = io.open(filename, tp) - if file==nil then return end - file:write(data) - file:close() -end -function io.movFile(path,topath) - io.cpFile(path,topath) - io.delFile(path) -end -function io.listFiles(dir) - if not(dir) then dir='' end - local f = io.popen('dir \''..dir..'\'') - if f then - return f:read('*a') - else - print('failed to read') - end -end -function io.getDir(dir) - if not dir then return io.getWorkingDir() end - if os.getOS()=='unix' then - return os.capture('cd '..dir..' ; cd') - else - return os.capture('cd '..dir..' & cd') - end -end -function io.getWorkingDir() - return io.popen'cd':read'*l' -end -function io.fileExists(path) - g=io.open(path or '','r') - if path =='' then - p='empty path' - return nil - end - if g~=nil and true or false then - p=(g~=nil and true or false) - end - if g~=nil then - io.close(g) - else - return false - end - return p -end -function io.fileCheck(file_name) - if not file_name then print('No path inputed') return false end - local file_found=io.open(file_name, 'r') - if file_found==nil then - file_found=false - else - file_found=true - end - return file_found -end -function io.dirExists(strFolderName) - strFolderName = strFolderName or io.getDir() - local fileHandle, strError = io.open(strFolderName..'\\*.*','r') - if fileHandle ~= nil then - io.close(fileHandle) - return true - else - if string.match(strError,'No such file or directory') then - return false - else - return true - end - end -end -function io.getAllItems(dir) - local t=os.capture("cd \""..dir.."\" & dir /a-d | find",true):lines() - return t -end -function io.listItems(dir) - if io.dirExists(dir) then - temp=io.listFiles(dir) -- current directory if blank - if io.getDir(dir)=='C:\\\n' then - a,b=string.find(temp,'C:\\',1,true) - a=a+2 - else - a,b=string.find(temp,'..',1,true) - end - temp=string.sub(temp,a+2) - list=string.linesToTable(temp) - temp=string.sub(temp,1,list[#list-2]) - slist=string.lines(temp) - table.remove(slist,1) - table.remove(slist,#slist) - temp={} - temp2={} - for i=1,#slist do - table.insert(temp,string.sub(slist[i],40,-1)) - end - return temp - else - return nil - end -end -function io.getDirectories(dir,l) - if dir then - dir=dir..'\\' - else - dir='' - end - local temp2=io.scanDir(dir) - for i=#temp2,1,-1 do - if io.fileExists(dir..temp2[i]) then - table.remove(temp2,i) - elseif l then - temp2[i]=dir..temp2[i] - end - end - return temp2 -end -function io.getFiles(dir,l) - if dir then - dir=dir..'\\' - else - dir='' - end - local temp2=io.scanDir(dir) - for i=#temp2,1,-1 do - if io.dirExists(dir..temp2[i]) then - table.remove(temp2,i) - elseif l then - temp2[i]=dir..temp2[i] - end - end - return temp2 -end -function io.getFullName(name) - local temp=name or arg[0] - if string.find(temp,'\\',1,true) or string.find(temp,'/',1,true) then - temp=string.reverse(temp) - a,b=string.find(temp,'\\',1,true) - if not(a) or not(b) then - a,b=string.find(temp,'/',1,true) - end - return string.reverse(string.sub(temp,1,b-1)) - end - return temp -end -function io.getName(file) - local name=io.getFullName(file) - name=string.reverse(name) - a,b=string.find(name,'.',1,true) - name=string.sub(name,a+1,-1) - return string.reverse(name) -end -function io.readFile(file) - local f = io.open(file, 'rb') - local content = f:read('*all') - f:close() - return content -end -function io.getExtension(file) - local file=io.getFullName(file) - file=string.reverse(file) - local a,b=string.find(file,'.',0,true) - local temp=string.sub(file,1,b) - return string.reverse(temp) -end -function io.pathToTable(path) - local p=io.splitPath(path) - local temp={} - temp[p[1]]={} - local last=temp[p[1]] - for i=2,#p do - snd=last - last[p[i]]={} - last=last[p[i]] - end - return temp,last,snd -end -function io.splitPath(str) - return string.split(str,'[\\/]+') -end - -function io.parseDir(dir,t) - io.tempFiles={} - function _p(dir) - local dirs=io.getDirectories(dir,true) - local files=io.getFiles(dir,true) - for i=1,#files do - p,l,s=io.pathToTable(files[i]) - if t then - s[io.getFullName(files[i])]=io.readFile(files[i]) - else - s[io.getFullName(files[i])]=io.open(files[i],'r+') - end - table.merge(io.tempFiles,p) - end - for i=1,#dirs do - table.merge(io.tempFiles,io.pathToTable(dirs[i])) - _p(dirs[i],t) - end - end - _p(dir) - return io.tempFiles -end -function io.parsedir(dir,f) - io.tempFiles={} - function _p(dir,f) - local dirs=io.getDirectories(dir,true) - local files=io.getFiles(dir,true) - for i=1,#files do - if not f then - table.insert(io.tempFiles,files[i]) - else - f(files[i]) - end - end - for i=1,#dirs do - _p(dirs[i],f) - end - end - _p(dir,f) - return io.tempFiles -end -function io.driveReady(drive) - drive=drive:upper() - if not(drive:find(':',1,true)) then - drive=drive..':' - end - drives=io.getDrives() - for i=1,#drives do - if drives[i]==drive then - return true - end - end - return false -end -function io.getDrives() - if os.getOS()=='windows' then - local temp={} - local t1=os.capture('wmic logicaldisk where drivetype=2 get deviceid, volumename',true) - local t2=os.capture('wmic logicaldisk where drivetype=3 get deviceid, volumename',true) - for drive,d2 in t1:gmatch('(.:)%s-(%w+)') do - if #d2>1 then - table.insert(temp,drive) - end - end - for drive in t2:gmatch('(.:)') do - table.insert(temp,drive) - end - return temp - end - error('Command is windows only!') -end --- table Additions -function table.dump(t,indent) - local names = {} - if not indent then indent = '' end - for n,g in pairs(t) do - table.insert(names,n) - end - table.sort(names) - for i,n in pairs(names) do - local v = t[n] - if type(v) == 'table' then - if(v==t) then - print(indent..tostring(n)..': <-') - else - print(indent..tostring(n)..':') - table.dump(v,indent..' ') - end - else - if type(v) == 'function' then - print(indent..tostring(n)..'()') - else - print(indent..tostring(n)..': '..tostring(v)) - end - end - end -end -function table.alphanumsort(o) - local function padnum(d) local dec, n = string.match(d, '(%.?)0*(.+)') - return #dec > 0 and ('%.12f'):format(d) or ('%s%03d%s'):format(dec, #n, n) - end - table.sort(o, function(a,b) return tostring(a):gsub('%.?%d+',padnum)..('%3d'):format(#b)< tostring(b):gsub('%.?%d+',padnum)..('%3d'):format(#a) end) - return o -end -function table.foreach(t,f) - for i,v in pairs(t) do - f(v) - end -end -function table.merge(t1, t2) - for k,v in pairs(t2) do - if type(v) == 'table' then - if type(t1[k] or false) == 'table' then - table.merge(t1[k] or {}, t2[k] or {}) - else - t1[k] = v - end - else - t1[k] = v - end - end - return t1 -end -function table.print(tbl, indent) - if not indent then indent = 0 end - for k, v in pairs(tbl) do - formatting = string.rep(' ', indent) .. k .. ': ' - if type(v) == 'table' then - print(formatting) - table.print(v, indent+1) - else - print(formatting .. tostring(v)) - end - end -end -function table.merge(t1, t2) - for k,v in pairs(t2) do - if type(v) == 'table' then - if type(t1[k] or false) == 'table' then - table.merge(t1[k] or {}, t2[k] or {}) - else - t1[k] = v - end - else - t1[k] = v - end - end - return t1 -end -function table.clear(t) - for k in pairs (t) do - t[k] = nil - end -end -function table.copy(t) - function deepcopy(orig) - local orig_type = type(orig) - local copy - if orig_type == 'table' then - copy = {} - for orig_key, orig_value in next, orig, nil do - copy[deepcopy(orig_key)] = deepcopy(orig_value) - end - setmetatable(copy, deepcopy(getmetatable(orig))) - else -- number, string, boolean, etc - copy = orig - end - return copy - end - return deepcopy(t) -end -function table.swap(tab,i1,i2) - tab[i1],tab[i2]=tab[i2],tab[i1] -end -function table.append(t1, ...) - t1,t2= t1 or {},{...} - for k,v in pairs(t2) do - t1[#t1+1]=t2[k] - end - return t1 -end -function table.compare(t1, t2,d) - if d then - return table.deepCompare(t1,t2) - end - --if #t1 ~= #t2 then return false end - if #t2>#t1 then - for i=1,#t2 do - if t1[i] ~= t2[i] then - return false,t2[i] - end - end - else - for i=1,#t1 do - if t1[i] ~= t2[i] then - return false,t2[i] - end - end - end - return true -end -function table.deepCompare(t1,t2) - if t1==t2 then return true end - if (type(t1)~='table') then return false end - local mt1 = getmetatable(t1) - local mt2 = getmetatable(t2) - if( not table.deepCompare(mt1,mt2) ) then return false end - for k1,v1 in pairs(t1) do - local v2 = t2[k1] - if( not table.deepCompare(v1,v2) ) then return false end - end - for k2,v2 in pairs(t2) do - local v1 = t1[k2] - if( not table.deepCompare(v1,v2) ) then return false end - end - return true -end -function table.has(t,_v) - for i,v in pairs(t) do - if v==_v then - return true - end - end - return false -end -function table.reverse(tab) - local size = #tab - local newTable = {} - for i,v in ipairs (tab) do - newTable[size-i] = v - end - for i=1,#newTable do - tab[i]=newTable[i] - end -end --- Math Additions -local Y = function(g) local a = function(f) return f(f) end return a(function(f) return g(function(x) local c=f(f) return c(x) end) end) end -local F = function(f) return function(n)if n == 0 then return 1 else return n*f(n-1) end end end -math.factorial = Y(F) -math.fib={} -math.fib.fibL={} -setmetatable(math.fib,{__call=function(self,n) - if n<=2 then - return 1 - else - if self.fibL[n] then - return self.fibL[n] - else - local t=math.fib(n-1)+math.fib(n-2) - self.fibL[n]=t - return t - end - end -end}) -local floor,insert = math.floor, table.insert -function math.basen(n,b) - n = floor(n) - if not b or b == 10 then return tostring(n) end - local digits = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' - local t = {} - local sign = '' - if n < 0 then - sign = '-' - n = -n - end - repeat - local d = (n % b) + 1 - n = floor(n / b) - insert(t, 1, digits:sub(d,d)) - until n == 0 - return sign .. table.concat(t,'') -end -function math.convbase(n,b,tb) - return math.basen(tonumber(tostring(n),b),tb) -end -if BigNum then - function BigNum.mod(a,b) - return a-((a/b)*b) - end - local floor,insert = math.floor, table.insert - function math.basen(n,b) - n = BigNum.new(n) - if not b or b == 10 then return tostring(n) end - local digits = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' - local t = {} - local sign = '' - if n < BigNum.new(0) then - sign = '-' - n = -n - end - repeat - local d = BigNum.mod(n , b) + 1 - n = n/b - d=tonumber(tostring(d)) - insert(t, 1, digits:sub(d,d)) - until tonumber(tostring(n)) == 0 - return sign .. table.concat(t,'') - end - function math.to10(n,b) - local num=tostring(n) - local sum=BigNum.new() - local digits = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' - for i=1,#num do - local v=digits:find(num:sub(i,i),1,true) - sum=sum+BigNum.new(tonumber(v)-1)*BigNum.pow(BigNum.new(b),BigNum.new(#num-i)) - end - return sum - end - function math.convbase(n,b,tb) - return math.basen(math.to10(n,b),tb) - end -end -function math.numfix(n,x) - local str=tostring(n) - if #str olleh -nil = binobj:flipbits() -- flips the binary bits -nil** = binobj:segment(a,b) -- gets a segment of the binobj data works just like string.sub(a,b) without str -nil* = binobj:insert(a,i) -- inserts i (string or number(converts into string)) in position a -nil* = binobj:parseN(n) -- removes ever (nth) byte of data -nil = binobj:getlength() -- gets length or size of binary data -nil* = binobj:shift(n) -- shift the binary data by n positive --> negitive <-- -nil* = binobj:delete(a,b) -- deletes part of a binobj data Usage: binobj:delete(#) deletes at pos # binobj:delete(#1,#2) deletes from #1 to #2 binobj:delete('string') deletes all instances of 'byte' as a string Use string.char(#) or '\#' to get byte as a string -nil* = binobj:encrypt(seed) -- encrypts data using a seed, seed may be left blank -nil* = binobj:decrypt(seed) -- decrypts data encrypted with encrypt(seed) -nil* = binobj:shuffle() -- Shuffles the data randomly Note: there is no way to get it back!!! If original is needed clone beforehand -nil** = binobj:mutate(a,i) -- changes position a's value to i -nil = binobj:merge(o,t) -- o is the binobj you are merging if t is true it merges the new data to the left of the binobj EX: b:merge(o,true) b='yo' o='data' output: b='datayo' b:merge(o) b='yo' o='data' output: b='yodata' -nil* = binobj:parseA(n,a,t) -- n is every byte where you add, a is the data you are adding, t is true or false true before false after -nil = binobj:getHEX(a,b) -- returns the HEX of the bytes between a,b inclusive -nil = binobj:cryptM() -- a mirrorable encryptor/decryptor -nil = binobj:addBlock(d,n) -- adds a block of data to a binobj s is size d is data e is a bool if true then encrypts string values. if data is larger than 'n' then data is lost. n is the size of bytes the data is Note: n is no longer needed but you must use getBlock(type) to get it back -nil = binobj:getBlock(t,n) -- gets block of code by type -nil = binobj:seek(n) -- used with getBlock EX below with all 3 -nil* = binobj:morph(a,b,d) -- changes data between point a and b, inclusive, to d -nil = binobj:fill(n,d) -- fills binobj with data 'd' for n -nil = binobj:fillrandom(n) -- fills binobj with random data for n -nil = binobj:shiftbits(n) -- shifts all bits by n amount -nil = binobj:shiftbit(n,i) -- shifts a bit ai index i by n -nil# = binobj:streamwrite(d,n) -- writes to the streamable binobj d data n position -nil# = binobj:open() -- opens the streamable binobj -nil# = binobj:close() -- closes the streamable binobj -nil = binobj:wipe() -- erases all data in the file -nil* = binobj:tackB(d) -- adds data to the beginning of a file -nil = binobj:tackE(d) -- adds data to the end of a file -nil = binobj:parse(n,f) -- loops through each byte calling function 'f' with the args(i,binobj,data at i) -nil = binobj:flipbit(i) -- flips the binary bit at position i -nil* = binobj:gsub() -- just like string:gsub(), but mutates self -nil = blockWriter:addNamedBlock(name,value) -- writes a named block to the file with name 'name' and the value 'value' - -Note: numbers are written in Big-endian use bin.endianflop(d) to filp to Little-endian - -Note: binobj:tonumber() returns big,little endian so if printing do: b,l=binobj:tonumber() print(l) print(b) - -nil = bitobj:add(i) -- adds i to the bitobj i can be a number (base 10) or a bitobj -nil = bitobj:sub(i) -- subs i to the bitobj i can be a number (base 10) or a bitobj -nil = bitobj:multi(i) -- multiplys i to the bitobj i can be a number (base 10) or a bitobj -nil = bitobj:div(i) -- divides i to the bitobj i can be a number (base 10) or a bitobj -nil = bitobj:flipbits() -- filps the bits 1 --> 0, 0 --> 1 -string = bitobj:getBin() -- returns 1's & 0's of the bitobj - -# stream objects only -* not compatible with stream files -** works but do not use with large files or it works to some degree -*** in stream objects all changes are made directly to the file, so there is no need to do tofile() -*D -]] - -bin.Changelog=[[ -Version.Major.Minor -------------------------- -1.0.0 : initial release load/new/tofile/clone/closeto/compare/sub/reverse/flip/segment/insert/insert/parseN/getlength/shift -1.0.1 : update Delete/tonumber/getbyte/ -1.0.2 : update Changed how delete works. Added encrypt/decrypt/shuffle -1.0.3 : update Added bits class, Added in bin: tobit/mutate/parseA Added in bits: add/sub/multi/div/isover/tobyte/tonumber/flip -1.0.4 : update Changed tobyte() to tobytes()/flipbit() to flipbits() and it now returns a binobj not str Added bin:merge -1.0.5 : update Changed bin.new() now hex data can be inserted EX: bin.new('0xFFC353D') Added in bin: getHEX/cryptM/addBlock/getBlock/seek -1.0.6 : update Added bin.NumtoHEX/bin:getHEX/bin.HEXtoBin/bin.HEXtoStr/bin.tohex/bin.fromhex -1.0.7 : update Added bin:morph/bin.endianflop/bin:scan/bin.ToStr -1.0.8 : update Added bin:fill/bin:fillrandom -1.1.0 : update Added bin.packLLIB/bin.unpackLLIB -1.2.0 : update Updated llib files -1.3.0 : Update Changed bin.unpackLLIB and bin.load() Added: bin.fileExist -1.4.0 : Update Changed bin.unpackLLIB bin.packLLIB Added: bin:shiftbits(n) bin:shiftbit(n,i) - -Woot!!! Version 2 -2.0.0 HUGE UPDATE Added Streamable files!!! lua 5.1, 5.2 and 5.3 compatable!!! -#binobj is the same as binobj:getlength() but only works in 5.2 and 5.3, in 5.1 just use getlength() or getSize() for compatibility -Now you can work with gigabyte sized data without memory crashes(streamable files[WIP]). - -Stream Compatible methods: - sub(a,b) - getlength() - tofile(filename) - flipbits() - tonumber(a,b) - getbyte(n) - segment(a,b) - parse(n,f) - tobits(i) - reverse() - flipbit(i) - cryptM() - getBlock(t,n) - addBlock(d,n) - shiftbits(n) - shiftbit(n,i) - getHEX(a,b) - -Added functions in this version: - binobj:streamwrite(d,n) - binobj:open() - binobj:close() - binobj:tackB(d) - binobj:tackE(d) - binobj:parse(n,f) - binobj:flipbit(i) - bin.stream(file) - binobj:streamData(a,b) - bin.getVersion() - bin.escapeStr(str) - binobj:streamread(a,b) - binobj:canStreamWrite() - binobj:wipe() - -Woot!!! Version 3 -3.0.0 HUGE UPDATE!!! - Added: bin.newVFS() bin.loadVFS() bin.textToBinary(txt) bin.decodeBits(bindata) bitobj:getBin() - Updated: bin.addBlock() <-- Fixed error with added features to the bits.new() function that allow for new functions to work - Notice: The bin library now requires the utils library!!! Put utils.lua in the lua/ directory -3.1.0 - Added: bin.newTempFile(data) binobj:setEndOfFile(n) bin.randomName(n,ext) - Updated: bin:tackE() bin:fill() bin:fillrandom() are now stream compatible! - Notice: bin:setEndOfFile() only works on streamable files! -3.1.1 - Added: bin.trimNul(s) bin:gsub() -3.1.2 - Added: log(data,name,fmt) - In secret something is brewing... - -3.1.3 - Added: bin:getHash(n) -3.2.1 - Added: bin.encryptA(data,seed), bin.decryptA(data,seed), bin.encryptB(data,seed), bin.decryptB(data,seed), bin:flush() - Updated: bin:encrypt(seed) and bin:decrypt(seed) - Fixed: bin:shiftbit() not working right with streamable files -3.2.2 - Fixed: bits.new() -- minor mistake huge error -3.2.3 - General bug fixes - Changed how bin.ToStr(t) -- functions are no longer valid data types -3.3.0 - Added: - bin:getSize() -- same as bin:getlength() just makes more sense. bin:getlength() is still valid and always will be. - bin.newLink() -- creates a link to a file object... Its like opening a file without opening it... Lua can only open a maximum of 200 files so use links if you will be going beyond that or make sure to close your files - bin.getHash2(h,n) -- 'h' hash size 8bit,16bit,32bit,64bit, 128bit, 100000bit whatever. is a number 'n' is the segmentation size defualt is 1024 greater numbers result in faster hashes but eaiser to forge hashes -3.4.1:(7/22/2016) NOTE: I started to add dates so I can see my work flow - Added: - binobj:getData() -- returns bin object as a string - bin:newDataBuffer(s) - Fixed: binobj:tonumber(a,b) -4.0.0:(7/23/2016) - Added: - bin.bufferToBin(b) - bin.binToBuffer(b) - bin.getLuaVersion() - bin.newNamedBlock(indexSize) - bin.newStreamedNamedBlock(indexSize,path) - bin.loadNamedBlock(path) - bin.getIndexSize(tab) - bits.numToBytes(num,occ) -4.1.0:(11/2/2016) NOTE: I took quite a long break due to college lol - Added: - bin.namedBlockManager(name) - Allows for a new way to use NamedBlocks - Example usage: - test=bin.namedBlockManager() - test["name"]="Ryan" -- My name lol - test["age"]=21 -- my age lol - test:tofile("test.dat") - --Now lets load the data we created - test2=bin.namedBlockManager("test.dat") - print(test2["name"]) - print(test2["age"]) - Changed: - bin.newNamedBlock(indexSize) - Now allows for indexSize to be nil and dynamacally adds to the size of the index - Fixed: - bin.loadNamedBlock(name) - Issue with indexing - TODO: - Allow streamed files to have expanding indexes -4.2.0:(12/21/2016) - Added: - bin.gcd(m,n) *takes number types returns a number - gets the greatest common denominator between 2 numbers m and n - bin.numToFraction(num) *takes number type returns a string type - converts a decimal to a fraction - so 5.5 would become 11/2 - bin.doubleToString(double) *takes number type returns string - converts a double to a string - bin.stringToDouble(str) *takes string type returns number type - converts the doublestring into a number - NOTE: this string can be 2 lengths! Either 9 bytes or 25 bytes... depending on the precision needed the program will convert the data - Also: the miniheader -/+ is for 9byte doubles the miniheader _/=(same keys as -/+ on an American keyboard) is for 25byte doubles - Changed: - bits.numToBytes(n,fit,func) - added argument func which is called when the number n takes up more space than size 'fit' - passes a ref table with keys num and fit, modifying these effects the output. - Note: If you change ref.fit make sure to make ref.num fits by adding \0 to the beginning of the numberstring - TODO: - add more useful features :P -4.2.1:(12/23/2016) - Added: - bin.decompress(comp) lzw commpression - bin.compress(uncomp) lzw decommpression - bin:segmentedRead(size,func) -4.3.0:(12/26/2016) - Added: - bin.tob64(data) - converts string data to b64 data - bin.fromb64(data) - converts b64 data to string data - bin:getB64() - returns b64 data from binobj - bits.lsh(value,shift) bit lshift - bits.rsh(value,shift) bit rshift - bits.bit(x,b) bit thing - bits.lor(x,y) or - Changed: - bin.new(data,hex,b64) hex if true treats data as hexdata, b64 if true treats data like b64data - Now allows b64 data to be used in construction of a bin file -4.4.0:(1/1/2017) - Added: - sinkobj=bin:newSink() - nil=sinkobj:tackE(data) - adds data into the sink, same method that binobj and streamobjs have. This does what you would expest the binobj to do but much quicker - nil=sinkobj:tofile(path) - creates a file containing the contents of the sink - str=sinkobj:getData() - returns the data of the sink as a string - nil=sinkobj:reset() - Clears the sink -4.4.1:(1/2/2017) - Changed: - bin.stream(file,lock) - Modified stream files so that multiple streams can link to one file by sharing handles -4.4.2:(1/10/2017) - Added: - bin.freshStream(file) - creates a stream object that wipes all data if the file already exists and readys the object for writing. In short it's doing: bin.new():tofile(file) return bin.stream(file,false) - -- I found myself doing that so much I made a method to simplify the process -4.5.0:(3/31/2017) - Added: - bin:getDataBuffer(a,b) -- a and b are the location to open on the streamed object they are not required though - -- If left out the entire file is open to used as a buffer! Even a empty streamed file works. Be sure to fill the buffer before trying to write to a location without data - -- Index 1 is the start regardless of where you open up the file - Note: Only works on streamed files! Use bin:newDataBuffer(s) to use the non streamed version -]] -bin.data='' -bin.t='bin' -bin.__index = bin -bin.__tostring=function(self) return self:getData() end -bin.__len=function(self) return self:getlength() end -bits={} -bits.data='' -bits.t='bits' -bits.__index = bits -bits.__tostring=function(self) return self.data end -bits.__len=function(self) return (#self.data)/8 end -bin.lastBlockSize=0 -bin.streams={} -- allows for multiple stream objects on one file... tricky stuff lol ---[[---------------------------------------- -Links -------------------------------------------]] -function bin.newLink(path) - if not path then - error("Must include a path when using a link!") - end - local c={} - c.path=path - c.tempfile={} - local mt={ - __tostring=function(self) - if self:getlength()>2048 then - -- - end - end, - __len=function(self) - return self:getlength() - end - } - function c:getlength() - -- - end -end - - ---[[---------------------------------------- -utils -------------------------------------------]] -function cleanName(name) - name=name:gsub("\\","") - name=name:gsub("/","") - name=name:gsub(":","") - name=name:gsub("*","") - name=name:gsub("%?","") - name=name:gsub("\"","''") - name=name:gsub("<","") - name=name:gsub(">","") - name=name:gsub("|","") - return name -end -function math.numfix(n,x) - local str=tostring(n) - if #str/dev/null','r') - if fh then - osname = fh:read() - end - if osname then return osname end - end - local winver='Unknown Version' - local a,b,c=os.capture('ver'):match('(%d+).(%d+).(%d+)') - local win=a..'.'..b..'.'..c - if type(t)=='string' then - win=t - end - if win=='4.00.950' then - winver='95' - elseif win=='4.00.1111' then - winver='95 OSR2' - elseif win=='4.00.1381' then - winver='NT 4.0' - elseif win=='4.10.1998' then - winver='98' - elseif win=='4.10.2222' then - winver='98 SE' - elseif win=='4.90.3000' then - winver='ME' - elseif win=='5.00.2195' then - winver='2000' - elseif win=='5.1.2600' then - winver='XP' - elseif win=='5.2.3790' then - winver='Server 2003' - elseif win=='6.0.6000' then - winver='Vista/Windows Server 2008' - elseif win=='6.0.6002' then - winver='Vista SP2' - elseif win=='6.1.7600' then - winver='7/Windows Server 2008 R2' - elseif win=='6.1.7601' then - winver='7 SP1/Windows Server 2008 R2 SP1' - elseif win=='6.2.9200' then - winver='8/Windows Server 2012' - elseif win=='6.3.9600' then - winver='8.1/Windows Server 2012' - elseif win=='6.4.9841' then - winver='10 Technical Preview 1' - elseif win=='6.4.9860' then - winver='10 Technical Preview 2' - elseif win=='6.4.9879' then - winver='10 Technical Preview 3' - elseif win=='10.0.9926' then - winver='10 Technical Preview 4' - end - return 'Windows '..winver -end -function os.capture(cmd, raw) - local f = assert(io.popen(cmd, 'r')) - local s = assert(f:read('*a')) - f:close() - if raw then return s end - s = string.gsub(s, '^%s+', '') - s = string.gsub(s, '%s+$', '') - s = string.gsub(s, '[\n\r]+', ' ') - return s -end -function io.scanDir(directory) - directory=directory or io.getDir() - local i, t, popen = 0, {}, io.popen - if os.getOS()=='unix' then - for filename in popen('ls -a "'..directory..'"'):lines() do - i = i + 1 - t[i] = filename - end - else - for filename in popen('dir "'..directory..'" /b'):lines() do - i = i + 1 - t[i] = filename - end - end - return t -end -function io.getDir(dir) - if not dir then return io.getWorkingDir() end - if os.getOS()=='unix' then - return os.capture('cd '..dir..' ; cd') - else - return os.capture('cd '..dir..' & cd') - end -end -function string.split(str, pat) - local t = {} -- NOTE: use {n = 0} in Lua-5.0 - local fpat = '(.-)' .. pat - local last_end = 1 - local s, e, cap = str:find(fpat, 1) - while s do - if s ~= 1 or cap ~= '' then - table.insert(t,cap) - end - last_end = e+1 - s, e, cap = str:find(fpat, last_end) - end - if last_end <= #str then - cap = str:sub(last_end) - table.insert(t, cap) - end - return t -end -function io.fileExists(path) - g=io.open(path or '','r') - if path =='' then - p='empty path' - return nil - end - if g~=nil and true or false then - p=(g~=nil and true or false) - end - if g~=nil then - io.close(g) - else - return false - end - return p -end -function io.getDirectories(dir,l) - if dir then - dir=dir..'\\' - else - dir='' - end - local temp2=io.scanDir(dir) - for i=#temp2,1,-1 do - if io.fileExists(dir..temp2[i]) then - table.remove(temp2,i) - elseif l then - temp2[i]=dir..temp2[i] - end - end - return temp2 -end -function io.getFiles(dir,l) - if dir then - dir=dir..'\\' - else - dir='' - end - local temp2=io.scanDir(dir) - for i=#temp2,1,-1 do - if io.dirExists(dir..temp2[i]) then - table.remove(temp2,i) - elseif l then - temp2[i]=dir..temp2[i] - end - end - return temp2 -end -function io.readFile(file) - local f = io.open(file, 'rb') - local content = f:read('*all') - f:close() - return content -end -function table.print(tbl, indent) - if not indent then indent = 0 end - for k, v in pairs(tbl) do - formatting = string.rep(' ', indent) .. k .. ': ' - if type(v) == 'table' then - print(formatting) - table.print(v, indent+1) - else - print(formatting .. tostring(v)) - end - end -end -function io.dirExists(strFolderName) - strFolderName = strFolderName or io.getDir() - local fileHandle, strError = io.open(strFolderName..'\\*.*','r') - if fileHandle ~= nil then - io.close(fileHandle) - return true - else - if string.match(strError,'No such file or directory') then - return false - else - return true - end - end -end -function io.getFullName(name) - local temp=name or arg[0] - if string.find(temp,'\\',1,true) or string.find(temp,'/',1,true) then - temp=string.reverse(temp) - a,b=string.find(temp,'\\',1,true) - if not(a) or not(b) then - a,b=string.find(temp,'/',1,true) - end - return string.reverse(string.sub(temp,1,b-1)) - end - return temp -end -function io.getName(file) - local name=io.getFullName(file) - name=string.reverse(name) - a,b=string.find(name,'.',1,true) - name=string.sub(name,a+1,-1) - return string.reverse(name) -end -function io.getPathName(path) - return path:sub(1,#path-#io.getFullName(path)) -end -function table.merge(t1, t2) - for k,v in pairs(t2) do - if type(v) == 'table' then - if type(t1[k] or false) == 'table' then - table.merge(t1[k] or {}, t2[k] or {}) - else - t1[k] = v - end - else - t1[k] = v - end - end - return t1 -end -function io.splitPath(str) - return string.split(str,'[\\/]+') -end -function io.pathToTable(path) - local p=io.splitPath(path) - local temp={} - temp[p[1]]={} - local last=temp[p[1]] - for i=2,#p do - snd=last - last[p[i]]={} - last=last[p[i]] - end - return temp,last,snd -end -function io.parseDir(dir,t) - io.tempFiles={} - function _p(dir) - local dirs=io.getDirectories(dir,true) - local files=io.getFiles(dir,true) - for i=1,#files do - p,l,s=io.pathToTable(files[i]) - if t then - s[io.getFullName(files[i])]=io.readFile(files[i]) - else - s[io.getFullName(files[i])]=io.open(files[i],'r+') - end - table.merge(io.tempFiles,p) - end - for i=1,#dirs do - table.merge(io.tempFiles,io.pathToTable(dirs[i])) - _p(dirs[i],t) - end - end - _p(dir) - return io.tempFiles -end -function io.parsedir(dir,f) - io.tempFiles={} - function _p(dir,f) - local dirs=io.getDirectories(dir,true) - local files=io.getFiles(dir,true) - for i=1,#files do - if not f then - table.insert(io.tempFiles,files[i]) - else - f(files[i]) - end - end - for i=1,#dirs do - _p(dirs[i],f) - end - end - _p(dir,f) - return io.tempFiles -end ---[[---------------------------------------- -Random -Not all of this is mine -------------------------------------------]] ---[[------------------------------------ -RandomLua v0.3.1 -Pure Lua Pseudo-Random Numbers Generator -Under the MIT license. -copyright(c) 2011 linux-man ---]]------------------------------------ - -local math_floor = math.floor - -local function normalize(n) --keep numbers at (positive) 32 bits - return n % 0x80000000 -end - -local function bit_and(a, b) - local r = 0 - local m = 0 - for m = 0, 31 do - if (a % 2 == 1) and (b % 2 == 1) then r = r + 2^m end - if a % 2 ~= 0 then a = a - 1 end - if b % 2 ~= 0 then b = b - 1 end - a = a / 2 b = b / 2 - end - return normalize(r) -end - -local function bit_or(a, b) - local r = 0 - local m = 0 - for m = 0, 31 do - if (a % 2 == 1) or (b % 2 == 1) then r = r + 2^m end - if a % 2 ~= 0 then a = a - 1 end - if b % 2 ~= 0 then b = b - 1 end - a = a / 2 b = b / 2 - end - return normalize(r) -end - -local function bit_xor(a, b) - local r = 0 - local m = 0 - for m = 0, 31 do - if a % 2 ~= b % 2 then r = r + 2^m end - if a % 2 ~= 0 then a = a - 1 end - if b % 2 ~= 0 then b = b - 1 end - a = a / 2 b = b / 2 - end - return normalize(r) -end - -local function seed() - --return normalize(tonumber(tostring(os.time()):reverse())) - return normalize(os.time()) -end - ---Mersenne twister -mersenne_twister = {} -mersenne_twister.__index = mersenne_twister - -function mersenne_twister:randomseed(s) - if not s then s = seed() end - self.mt[0] = normalize(s) - for i = 1, 623 do - self.mt[i] = normalize(0x6c078965 * bit_xor(self.mt[i-1], math_floor(self.mt[i-1] / 0x40000000)) + i) - end -end - -function mersenne_twister:random(a, b) - local y - if self.index == 0 then - for i = 0, 623 do - --y = bit_or(math_floor(self.mt[i] / 0x80000000) * 0x80000000, self.mt[(i + 1) % 624] % 0x80000000) - y = self.mt[(i + 1) % 624] % 0x80000000 - self.mt[i] = bit_xor(self.mt[(i + 397) % 624], math_floor(y / 2)) - if y % 2 ~= 0 then self.mt[i] = bit_xor(self.mt[i], 0x9908b0df) end - end - end - y = self.mt[self.index] - y = bit_xor(y, math_floor(y / 0x800)) - y = bit_xor(y, bit_and(normalize(y * 0x80), 0x9d2c5680)) - y = bit_xor(y, bit_and(normalize(y * 0x8000), 0xefc60000)) - y = bit_xor(y, math_floor(y / 0x40000)) - self.index = (self.index + 1) % 624 - if not a then return y / 0x80000000 - elseif not b then - if a == 0 then return y - else return 1 + (y % a) - end - else - return a + (y % (b - a + 1)) - end -end - -function twister(s) - local temp = {} - setmetatable(temp, mersenne_twister) - temp.mt = {} - temp.index = 0 - temp:randomseed(s) - return temp -end - ---Linear Congruential Generator -linear_congruential_generator = {} -linear_congruential_generator.__index = linear_congruential_generator - -function linear_congruential_generator:random(a, b) - local y = (self.a * self.x + self.c) % self.m - self.x = y - if not a then return y / 0x10000 - elseif not b then - if a == 0 then return y - else return 1 + (y % a) end - else - return a + (y % (b - a + 1)) - end -end - -function linear_congruential_generator:randomseed(s) - if not s then s = seed() end - self.x = normalize(s) -end - -function lcg(s, r) - local temp = {} - setmetatable(temp, linear_congruential_generator) - temp.a, temp.c, temp.m = 1103515245, 12345, 0x10000 --from Ansi C - if r then - if r == 'nr' then temp.a, temp.c, temp.m = 1664525, 1013904223, 0x10000 --from Numerical Recipes. - elseif r == 'mvc' then temp.a, temp.c, temp.m = 214013, 2531011, 0x10000 end--from MVC - end - temp:randomseed(s) - return temp -end - --- Multiply-with-carry -multiply_with_carry = {} -multiply_with_carry.__index = multiply_with_carry - -function multiply_with_carry:random(a, b) - local m = self.m - local t = self.a * self.x + self.c - local y = t % m - self.x = y - self.c = math_floor(t / m) - if not a then return y / 0x10000 - elseif not b then - if a == 0 then return y - else return 1 + (y % a) end - else - return a + (y % (b - a + 1)) - end -end - -function multiply_with_carry:randomseed(s) - if not s then s = seed() end - self.c = self.ic - self.x = normalize(s) -end - -function mwc(s, r) - local temp = {} - setmetatable(temp, multiply_with_carry) - temp.a, temp.c, temp.m = 1103515245, 12345, 0x10000 --from Ansi C - if r then - if r == 'nr' then temp.a, temp.c, temp.m = 1664525, 1013904223, 0x10000 --from Numerical Recipes. - elseif r == 'mvc' then temp.a, temp.c, temp.m = 214013, 2531011, 0x10000 end--from MVC - end - temp.ic = temp.c - temp:randomseed(s) - return temp -end --- Little bind for the methods: My code starts -randomGen={} -randomGen.__index=randomGen -function randomGen:new(s) - local temp={} - setmetatable(temp,randomGen) - temp[1]=twister() - temp[2]=lcg() - temp[3]=mwc() - temp.pos=1 - for i=1,3 do - temp[i]:randomseed(s) - end - return temp -end -function randomGen:randomseed(s) - self.pos=1 - self[1]:randomseed(s) - self[2]:randomseed(s) - self[3]:randomseed(s) -end -function randomGen:randomInt(a,b) - local t=self[self.pos]:random(a,b) - self.pos=self.pos+1 - if self.pos>3 then - self.pos=1 - end - return t -end -function randomGen:newND(a,b,s) - if not(a) or not(b) then error('You must include a range!') end - local temp=randomGen:new(s) - temp.a=a - temp.b=b - temp.range=b-a+1 - temp.dups={no=0} - function temp:nextInt() - local t=self:randomInt(self.a,self.b) - if self.dups[t]==nil then - self.dups[t]=true - self.dups.no=self.dups.no+1 - else - return self:nextInt() - end - if self.dups.no==self.range then - function self:nextInt() - return 1,true - end - return t - else - return t - end - end - function temp:nextIInt() - return function() return self:nextInt() end - end - return temp -end -lzw = {} -function lzw.encode(uncompressed) -- string - local dictionary, result, dictSize, w, c = {}, {}, 255, "" - for i = 0, 255 do - dictionary[string.char(i)] = i - end - for i = 1, #uncompressed do - c = string.sub(uncompressed, i, i) - if dictionary[w .. c] then - w = w .. c - else - table.insert(result, dictionary[w]) - dictSize = dictSize + 1 - dictionary[w .. c] = dictSize - w = c - end - end - if w ~= "" then - table.insert(result, dictionary[w]) - end - return result -end - -function lzw.decode(compressed) -- table - local dictionary, dictSize, entry, result, w, k = {}, 255, "", "", "" - for i = 0, 255 do - dictionary[i] = string.char(i) - end - for i = 1, #compressed do - k = compressed[i] - if dictionary[k] then - entry = dictionary[k] - elseif k == dictSize then - entry = w .. string.sub(w, 1, 1) - else - return nil, i - end - result = result .. entry - dictionary[dictSize] = w .. string.sub(entry, 1, 1) - dictSize = dictSize + 1 - w = entry - end - return result -end ---[[---------------------------------------- -BIN -------------------------------------------]] - -function bin:newSink() - local c={} - c.data={} - c.name="sinkobj" - c.num=1 - c.type="sink" - function c:tackE(data) - self.data[self.num]=data - self.num=self.num+1 - end - function c:tofile(path) - bin.new(table.concat(self.data)):tofile(path) - end - function c:getData() - return table.concat(self.data) - end - function c:reset() - self.data={} - end - function c:close() - -- does nothing lol - end - return c -end -function bin:segmentedRead(size,func) - local mSize=self:getSize() - local pSize=size - local iter=math.ceil(mSize/pSize) - for i=0,iter-1 do - func(self:sub((i*pSize)+1,(i+1)*pSize)) - end -end -function bin.compress(uncomp,n) - n=n or 9 - local cipher = lzw.encode(uncomp) - local dat={} - for i=1,#cipher do - local fix=bits.new(cipher[i]).data:match("0*(%d+)") - if cipher[i]==0 then - fix=string.rep("0",n) - end - fix=string.rep("0",n-#fix)..fix - table.insert(dat,fix) - end - str=table.concat(dat,"") - str=string.rep("0",8-#str%8)..str - comp={} - for i=0,(#str/8) do - table.insert(comp,bits.new(str:sub(i*8+1,i*8+8)):toSbytes()) - end - return table.concat(comp,"") -end -function bin.decompress(comp,n) - n=n or 9 - local tab={} - for i=1,#comp do - table.insert(tab,bits.new(comp:sub(i,i)).data) - end - tab=table.concat(tab,"") - tab=tab:match("0*(%d+)") - tab=string.rep("0",n-#tab%n)..tab - uncomp={} - for i=0,(#tab/n) do - table.insert(uncomp,tonumber(tab:sub(i*n+1,i*n+n),2)) - end - return lzw.decode(uncomp) -end -function bin:getSize() - return self:getlength() -end -function bin.getVersion() - return bin.Version[1]..'.'..bin.Version[2]..'.'..bin.Version[3] -end -function bin:gsub(...) - self.data=self.data:gsub(...) -end --- -function bin:trim() - self.data=self.data:match'^()%s*$' and '' or self.data:match'^%s*(.*%S)' -end -function bin._trim(str) - return str:match'^()%s*$' and '' or str:match'^%s*(.*%S)' -end -function bin:fullTrim(empty) - local t=self:lines() - for i=#t,1,-1 do - t[i]=bin._trim(t[i]) - if empty then - if t[i]=="" then - table.remove(t,i) - end - end - end - self.data = table.concat(t,"\n") -end -function bin:lines() - local t = {} - local function helper(line) table.insert(t, line) return '' end - helper((self.data:gsub('(.-)\r?\n', helper))) - return t -end -function bin._lines(str) - local t = {} - local function helper(line) table.insert(t, line) return '' end - helper((str:gsub('(.-)\r?\n', helper))) - return t -end --- -function bin:find(...) - return self.data:find(...) -end -function bin.fromhex(str) - return (str:gsub('..', function (cc) - return string.char(tonumber(cc, 16)) - end)) -end - --- working lua base64 codec (c) 2006-2008 by Alex Kloss --- compatible with lua 5.1 --- http://www.it-rfc.de --- licensed under the terms of the LGPL2 -bin.base64chars = {[0]='A',[1]='B',[2]='C',[3]='D',[4]='E',[5]='F',[6]='G',[7]='H',[8]='I',[9]='J',[10]='K',[11]='L',[12]='M',[13]='N',[14]='O',[15]='P',[16]='Q',[17]='R',[18]='S',[19]='T',[20]='U',[21]='V',[22]='W',[23]='X',[24]='Y',[25]='Z',[26]='a',[27]='b',[28]='c',[29]='d',[30]='e',[31]='f',[32]='g',[33]='h',[34]='i',[35]='j',[36]='k',[37]='l',[38]='m',[39]='n',[40]='o',[41]='p',[42]='q',[43]='r',[44]='s',[45]='t',[46]='u',[47]='v',[48]='w',[49]='x',[50]='y',[51]='z',[52]='0',[53]='1',[54]='2',[55]='3',[56]='4',[57]='5',[58]='6',[59]='7',[60]='8',[61]='9',[62]='-',[63]='_'} -function bin.tob64(data) - local bytes = {} - local result = "" - for spos=0,string.len(data)-1,3 do - for byte=1,3 do bytes[byte] = string.byte(string.sub(data,(spos+byte))) or 0 end - result = string.format('%s%s%s%s%s',result,bin.base64chars[bits.rsh(bytes[1],2)],bin.base64chars[bits.lor(bits.lsh((bytes[1] % 4),4), bits.rsh(bytes[2],4))] or "=",((#data-spos) > 1) and bin.base64chars[bits.lor(bits.lsh(bytes[2] % 16,2), bits.rsh(bytes[3],6))] or "=",((#data-spos) > 2) and bin.base64chars[(bytes[3] % 64)] or "=") - end - return result -end -bin.base64bytes = {['A']=0,['B']=1,['C']=2,['D']=3,['E']=4,['F']=5,['G']=6,['H']=7,['I']=8,['J']=9,['K']=10,['L']=11,['M']=12,['N']=13,['O']=14,['P']=15,['Q']=16,['R']=17,['S']=18,['T']=19,['U']=20,['V']=21,['W']=22,['X']=23,['Y']=24,['Z']=25,['a']=26,['b']=27,['c']=28,['d']=29,['e']=30,['f']=31,['g']=32,['h']=33,['i']=34,['j']=35,['k']=36,['l']=37,['m']=38,['n']=39,['o']=40,['p']=41,['q']=42,['r']=43,['s']=44,['t']=45,['u']=46,['v']=47,['w']=48,['x']=49,['y']=50,['z']=51,['0']=52,['1']=53,['2']=54,['3']=55,['4']=56,['5']=57,['6']=58,['7']=59,['8']=60,['9']=61,['-']=62,['_']=63,['=']=nil} -function bin.fromb64(data) - local chars = {} - local result="" - for dpos=0,string.len(data)-1,4 do - for char=1,4 do chars[char] = bin.base64bytes[(string.sub(data,(dpos+char),(dpos+char)) or "=")] end - result = string.format('%s%s%s%s',result,string.char(bits.lor(bits.lsh(chars[1],2), bits.rsh(chars[2],4))),(chars[3] ~= nil) and string.char(bits.lor(bits.lsh(chars[2],4), bits.rsh(chars[3],2))) or "",(chars[4] ~= nil) and string.char(bits.lor(bits.lsh(chars[3],6) % 192, (chars[4]))) or "") - end - return result -end --- ^^ - -function bin:getB64() - return bin.tob64(self.data) -end -if table.unpack==nil then - table.unpack=unpack -end -function bin.tohex(str) - return (str:gsub('.', function (c) - return string.format('%02X', string.byte(c)) - end)) -end -function bin:streamData(a,b) - if type(a)=='table' then - a,b,t=table.unpack(a) - end - if type(a)=='number' and type(b)=='string' then - return bin.load(self.file,a,b),bin.load(self.file,a,b).data - else - error('Invalid args!!! Is do you have a valid stream handle or is this a streamable object?') - end -end -function bin.new(data,hex,b64) - data=data or "" - data=tostring(data) - local c = {} - setmetatable(c, bin) - if string.sub(data,1,2)=='0x' and hex then - data=string.sub(data,3) - data=bin.fromhex(data) - elseif hex then - data=bin.fromhex(data) - end - if b64 then - data=bin.fromb64(data) - end - c.data=data - c.t='bin' - c.Stream=false - return c -end -function bin.freshStream(file) - bin.new():tofile(file) - return bin.stream(file,false) -end -function bin.stream(file,l) - local c=bin.new() - if bin.streams[file]~=nil then - c.file=file - c.lock = l - c.workingfile=bin.streams[file].workingfile - c.Stream=true - return c - end - if bin.fileExist(file) then - c.file=file - c.lock = l - c.workingfile=io.open(file,'rb+') - else - c.file=file - c.lock = l - c.workingfile=io.open(file,'w') - io.close(c.workingfile) - c.workingfile=io.open(file,'rb+') - end - c.Stream=true - bin.streams[file]=c - return c -end -function bin:streamwrite(d,n) - if self:canStreamWrite() then - if n then - self.workingfile:seek('set',n) - else - self.workingfile:seek('set',self.workingfile:seek('end')) - end - self.workingfile:write(d) - end -end -function bin:streamread(a,b) - a=a-1 - local loc=self.workingfile:seek('cur') - self.workingfile:seek('set',a) - local dat=self.workingfile:read(b-a) - self.workingfile:seek('set',loc) - return dat -end -function bin:streamreadNext(a) - return self.workingfile:read(a) -end -function bin:close() - if self:canStreamWrite() then - self.workingfile:close() - end -end -function bin:flush() - if self:canStreamWrite() then - self.workingfile:flush() - else - self:tofile(self.filepath) - end -end -function bin:open() - if self:canStreamWrite() then - self.workingfile=io.open(self.file,'r+') - end -end -function bin:canStreamWrite() - return (self.Stream==true and self.lock==false) -end -function bin:getDataBuffer(a,b,filler) - if self:canStreamWrite() then - if not(a) and not(b) then - a=1 - b=math.huge - elseif a and not(b) then - b=a - a=1 - if self:getSize()=k then - me:streamwrite(string.char(v),k+(ss-1)) - elseif type(v)=="string" and s>=k then - if #v~=1 then - t:fillBuffer(v,k+(ss)) - elseif s>=k then - me:streamwrite(v,k+(ss-1)) - else - print("Buffer Overflow!") - end - else - print("Warning Attempting to index outside defined range!") - end - end, - __tostring=function(t) -- GOOD - return t:getBuffer() - end - } - c.t="buffer" - c.dataS={} - function c:getBuffer(a,b) -- GOOD - if not(a) and not(b) then - local str={} - for i=ss,max do - table.insert(str,me:streamread(i+(ss-1),i+(ss-1))) - end - return table.concat(str) - else - return me:streamread(a+(ss-1),b+(ss-1)) - end - end - function c:getData() -- GOOD - return self:getBuffer() - end - function c:getBufferTable() -- GOOD - local str={} - for i=ss,max do - table.insert(str,me:streamread(i+(ss-1),i+(ss-1))) - end - return str - end - function c:getBufferSize() -- GOOD - return #self:getBuffer() - end - function c:getlength() -- GOOD - return #self:getBuffer() - end - function c:tonumber(a,b) -- GOOD - return bin.new(self:getBuffer(a,b)):tonumber() - end - c.getSize=c.getlength - function c:fillBuffer(sg,a) -- GOOD - for i=#sg+(a-1),a,-1 do - if i<=max then - local ii=(a+#sg)-i - self[ii+(a-1)]=sg:sub(ii,ii) - else - return print("Buffer Overflow!") - end - end - return a,a+#sg-1 - end - setmetatable(c,mt) - return c - else - error("Stream not opened for writing!") - end -end -function bin.load(file,s,r) - if not(s) or not(r) then - if type(file)~="string" then return bin.new() end - local f = io.open(file, 'rb') - local content = f:read('*a') - f:close() - return bin.new(content) - end - s=s or 0 - r=r or -1 - if type(r)=='number' then - r=r+s-1 - elseif type(r)=='string' then - r=tonumber(r) or -1 - end - local f = io.open(file, 'rb') - f:seek('set',s) - local content = f:read((r+1)-s) - f:close() - local temp=bin.new(content) - temp.filepath=file - return temp -end -function bin:tofile(filename) - if not(filename) or self.Stream then return nil end - io.mkFile(filename,self.data) -end -function bin.trimNul(s) - for i=1,#s do - if s:sub(i,i)=='\0' then - return s:sub(1,i-1) - end - end - return s -end -function bin:match(pat) - return self.data:match(pat) -end -function bin:gmatch(pat) - return self.data:gmatch(pat) -end -function bin:getHash(n) - if self:getlength()==0 then - return "NaN" - end - n=(n or 32)/2 - local rand = randomGen:newND(1,self:getlength(),self:getlength()) - local h,g={},0 - for i=1,n do - g=rand:nextInt() - table.insert(h,bin.tohex(self:sub(g,g))) - end - return table.concat(h,'') -end -function bin:getRandomHash(n) - if self:getlength()==0 then - return "NaN" - end - n=(n or 32)/2 - local rand = randomGen:new(math.random(1,self:getlength()^2)) - local h,g={},0 - for i=1,n do - g=rand:randomInt(1,self:getlength()) - table.insert(h,bin.tohex(self:sub(g,g))) - end - return table.concat(h,'') -end -function bin:newDataBuffer(s,def) - local c={} - local mt={ - __index=function(t,k,v) - if k<=t.maxBuffer then - if t.dataS[k] then - return string.byte(t.dataS[k]) - else - return "NOINDEX" - end - else - return - end - end, - __newindex=function(t,k,v) - if type(v)=="number" and t.maxBuffer>=k then - t.dataS[k]=string.char(v) - elseif type(v)=="string" and t.maxBuffer>=k then - if #v~=1 then - t:fillBuffer(v,k) - elseif t.maxBuffer>=k then - t.dataS[k]=v - else - print("Buffer Overflow!") - end - end - end, - __tostring=function(t) - return t:getBuffer() - end - } - c.t="buffer" - c.dataS={} - if s then - if type(s)=="number" then - c.maxBuffer=s - s=string.rep(def or"\0",s) - else - c.maxBuffer=math.huge - end - for i=1,#s do - c.dataS[i]=s:sub(i,i) - end - else - c.maxBuffer=math.huge - end - function c:getBuffer(a,b) - if a and b then - return table.concat(self.dataS,""):sub(a,b) - else - return table.concat(self.dataS,"") - end - end - function c:getData() - return table.concat(self.dataS,"") - end - function c:getBufferTable() - return self.dataS - end - function c:getBufferSize() - if self.maxBuffer~=math.huge then - return self.maxBuffer - end - return #self:getBuffer() - end - function c:getlength() - return #self:getBuffer(a,b) - end - function c:tonumber(a,b) - return bin.new(self:getBuffer(a,b)):tonumber() - end - c.getSize=c.getlength - function c:fillBuffer(s,a) - for i=0,#s-1 do - if i+a<=self.maxBuffer then - c.dataS[i+a]=s:sub(i+1,i+1) - else - return "Buffer Overflow!" - end - end - return a,a+#s-1 - end - setmetatable(c,mt) - return c -end -function bin:getHash2(h,n) - n=n or 1024 - h=(h or 32) - local temp=bin.new() - local len=self:getSize() - local seg=math.ceil(len/n) - temp:fill("\0",h) - for i=1,seg do - local s=bin.new(self:sub(n*(i-1)+1,n*i)):getHash(h) - for i=1,h do - temp:shiftbit(string.byte(s:sub(i,i)),i) - end - end - return temp:getHEX() -end -function bin.encryptA(data,seed) - seed=seed or 1 - local d=bin.new(data) - local r=randomGen:newND(1,#d.data,seed) - for i=1,#d.data do - d:shiftbit(r:nextInt(),i) - end - return bin.tohex(d.data) -end -function bin.decryptA(data,seed) - seed=seed or 1 - local d=bin.new('0x'..data) - local r=randomGen:newND(1,#d.data,seed) - for i=1,#d.data do - d:shiftbit(-r:nextInt(),i) - end - return d.data -end -function bin.encryptB(data,seed) - seed=seed or 'abcdefghijklmnopqrstuvwxyz' - seed=tostring(seed) - local d=bin.new(data) - local r,mr=1,#seed - for i=1,#d.data do - d:shiftbit(string.byte(seed:sub(r,r)),i) - r=r+1 - if r>mr then - r=1 - end - end - return bin.tohex(d.data) -end -function bin.decryptB(data,seed) - seed=seed or 'abcdefghijklmnopqrstuvwxyz' - seed=tostring(seed) - local d=bin.new('0x'..data) - local r,mr=1,#seed - for i=1,#d.data do - d:shiftbit(-string.byte(seed:sub(r,r)),i) - r=r+1 - if r>mr then - r=1 - end - end - return d.data -end -function bin:encrypt(seed) - seed=seed or 'abcdefghijklmnopqrstuvwxyz' - seed=tostring(seed) - local r,mr=1,#seed - for i=1,self:getlength() do - self:shiftbit(string.byte(seed:sub(r,r)),i) - r=r+1 - if r>mr then - r=1 - end - end -end -function bin:decrypt(seed) - seed=seed or 'abcdefghijklmnopqrstuvwxyz' - seed=tostring(seed) - local r,mr=1,#seed - for i=1,self:getlength() do - self:shiftbit(-string.byte(seed:sub(r,r)),i) - r=r+1 - if r>mr then - r=1 - end - end -end -function bin.randomName(n,ext) - n=n or math.random(7,15) - if ext then - a,b=ext:find('.',1,true) - if a and b then - ext=ext:sub(2) - end - end - local str,h = '',0 - strings = {'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','1','2','3','4','5','6','7','8','9','0','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'} - for i=1,n do - h = math.random(1,#strings) - str = str..''..strings[h] - end - return str..'.'..(ext or 'tmp') -end -function bin.newTempFile(data) - data=data or '' - local name=bin.randomName() - bin.new():tofile(name) - local tempfile=bin.stream(name,false) - tempfile:streamwrite(data,0) - tempfile:setEndOfFile(#data) - return tempfile -end -function bin:wipe() - if self:canStreamWrite() then - self:close() - os.remove(self.file) - self:open() - else - self.data='' - end -end -function bin:setEndOfFile(n) - if self:canStreamWrite() then - local name=bin.randomName() - local tempfile=bin.stream(name,false) - tempfile:streamwrite(self:sub(0,n-1)) - self:close() - os.remove(self.file) - tempfile:close() - os.rename(name,self.file) - self:open() - tempfile=nil - else - self.data=self.data:sub(1,n) - end -end -function bin:reverse() - if self:canStreamWrite() then - local x,f,b=self:getlength(),0,0 - for i=0,math.floor((x-1)/2) do - self:streamwrite(self:sub(i+1,i+1),x-i-1) - self:streamwrite(self:sub(x-i,x-i),i) - end - elseif self.Stream==false then - self.data=string.reverse(self.data) - end -end -function bin:flipbits() - if self:canStreamWrite() then - for i=0,self:getlength()-1 do - self:streamwrite(string.char(255-string.byte(self:streamread(i,i))),i) - end - elseif self.Stream==false then - local temp={} - for i=1,#self.data do - table.insert(temp,string.char(255-string.byte(string.sub(self.data,i,i)))) - end - self.data=table.concat(temp,'') - end -end -function bin:flipbit(i) - if self:canStreamWrite() then - self:streamwrite(string.char(255-string.byte(self:streamread(i-1,i-1))),i-1) - elseif self.Stream==false then - self:mutate(string.char(255-string.byte(string.sub(self.data,i,i))),i) - end -end -function bin:segment(a,b) -- needs to be updated!!! - if self:canStreamWrite() then - --[[local pos=1 - for i=a,b do - self:streamwrite(self:sub(i,i),b-a-i) - end]] - local temp=self:sub(a,b) - self:close() - local f=io.open(self.file,'w') - f:write(temp) - io.close(f) - self:open() - elseif self.Stream==false then - self.data=string.sub(self.data,a,b) - end -end -function bin:insert(i,a) - if self:canStreamWrite() then - -- do something - elseif self.Stream==false then - if type(i)=='number' then i=string.char(i) end - self.data=string.sub(self.data,1,a)..i..string.sub(self.data,a+1) - end -end -function bin:parseN(n) - if self:canStreamWrite() then - -- do something - elseif self.Stream==false then - local temp={} - for i=1,#self.data do - if i%n==0 then - table.insert(temp,string.sub(self.data,i,i)) - end - end - self.data=table.concat(temp,'') - end -end -function bin:parse(n,f) - local f = f - local n=n or 1 - if not(f) then return end - for i=1,self:getlength() do - if i%n==0 then - f(i,self,self:sub(i,i)) - end - end -end -function bin.copy(file,tofile,s) - if not(s) then - bin.load(file):tofile(tofile) - else - rf=bin.stream(file) - wf=bin.stream(tofile,false) - for i=1,rf:getlength(),s do - wf:streamwrite(rf:sub(i,i-1+s)) - end - end -end -function bin:getlength() - if self.Stream then - if self.workingfile==nil then print("Error getting size of file!") return 0 end - local current = self.workingfile:seek() -- get current position - local size = self.workingfile:seek('end') -- get file size - self.workingfile:seek('set', current) -- restore position - return size - elseif self.Stream==false then - return #self.data - end -end -function bin:sub(a,b) - if self.Stream then - return bin.load(self.file,a-1,tostring(b-1)).data - elseif self.Stream==false then - return string.sub(self.data,a,b) - end -end -function bin:tackB(d) - if self:canStreamWrite() then - -- do something don't know if possible - elseif self.Stream==false then - self.data=d..self.data - end -end -function bin:tackE(d) - if type(d)=='table' then - if d:canStreamWrite() then - d=d:sub(1,d:getlength()) - else - d=d.data - end - return - end - if self:canStreamWrite() then - self:streamwrite(d) - elseif self.Stream==false then - self.data=self.data..d - end -end -function bin:clone(filename) - if self:canStreamWrite() then - -- do something - elseif self.Stream==false then - return bin.new(self.data) - end -end -function bin.closeto(a,b,v) - if self:canStreamWrite() then - -- do something - elseif self.Stream==false then - if type(a)~=type(b) then - error('Attempt to compare unlike types') - elseif type(a)=='number' and type(b)=='number' then - return math.abs(a-b)<=v - elseif type(a)=='table' and type(b)=='table' then - if a.data and b.data then - return (math.abs(string.byte(a.data)-string.byte(b.data)))<=v - else - error('Attempt to compare non-bin data') - end - elseif type(a)=='string' and type(b)=='string' then - return math.abs(string.byte(a)-string.byte(b))<=v - else - error('Attempt to compare non-bin data') - end - end -end -function bin:compare(_bin,t) - if self:canStreamWrite() then - -- do something - elseif self.Stream==false then - t=t or 1 - local tab={} - local a,b=self:getlength(),_bin:getlength() - if not(a==b) then - print('Unequal Lengths!!! Equalizing...') - if a>b then - _bin.data=_bin.data..string.rep(string.char(0),a-b) - else - self.data=self.data..string.rep(string.char(0),b-a) - end - end - if t==1 then - for i=1,self:getlength() do - table.insert(tab,self:sub(i,i)==_bin:sub(i,i)) - end - else - for i=1,self:getlength() do - table.insert(tab,bin.closeto(self:sub(i,i),_bin:sub(i,i),t)) - end - end - local temp=0 - for i=1,#tab do - if tab[i]==true then - temp=temp+1 - end - end - return (temp/#tab)*100 - end -end -function bin:shift(n) - if self:canStreamWrite() then - local a,b,x,p='','',self:getlength(),0 - for i=1,x do - if i+n>x then - p=(i+n)-(x) - else - p=i+n - end - end - elseif self.Stream==false then - n=n or 0 - local s=#self.data - if n>0 then - self.data = string.sub(self.data,s-n+1)..string.sub(self.data,1,s-n) - elseif n<0 then - n=math.abs(n) - self.data = string.sub(self.data,n+1)..string.sub(self.data,1,n*1) - end - end -end -function bin:delete(a,b) - if self:canStreamWrite() then - -- do something - elseif self.Stream==false then - if type(a)=='string' then - local tab={} - for i=1,self:getlength() do - if self:getbyte(i)~=string.byte(a) then - table.insert(tab,self:sub(i,i)) - end - end - self.data=table.concat(tab) - elseif a and not(b) then - self.data=self:sub(1,a-1)..self:sub(a+1) - elseif a and b then - self.data=self:sub(1,a-1)..self:sub(b+1) - else - self.data='' - end - end -end -function bin:tonumber(a,b) - local temp={} - if a then - temp.data=self:sub(a,b) - else - temp=self - end - local l,r=0,0 - local g=#temp.data - for i=1,g do - r=r+(256^(g-i))*string.byte(string.sub(temp.data,i,i)) - l=l+(256^(i-1))*string.byte(string.sub(temp.data,i,i)) - end - return r,l -end -function bin:getbyte(n) - return string.byte(self:sub(n,n)) -end -function bin:shuffle(s) - if self:canStreamWrite() then - -- do something - elseif self.Stream==false then - s=tonumber(s) or 4546 - math.randomseed(s) - local t={} - for i=1,self:getlength() do - table.insert(t,self:sub(i,i)) - end - local n = #t - while n >= 2 do - local k = math.random(n) - t[n], t[k] = t[k], t[n] - n = n - 1 - end - self.data=table.concat(t) - end -end -function bin:tobits(i) - return bits.new(self:getbyte(i)) -end -function bin:mutate(a,i) - if self:canStreamWrite() then - self:streamwrite(a,i-1) - elseif self.Stream==false then - self:delete(i) - self:insert(a,i-1) - end -end -function bin:parseA(n,a,t) - if self:canStreamWrite() then - -- do something - elseif self.Stream==false then - local temp={} - for i=1,#self.data do - if i%n==0 then - if t then - table.insert(temp,a) - table.insert(temp,string.sub(self.data,i,i)) - else - table.insert(temp,string.sub(self.data,i,i)) - table.insert(temp,a) - end - else - table.insert(temp,string.sub(self.data,i,i)) - end - end - self.data=table.concat(temp,'') - end -end -function bin:merge(o,t) - if self:canStreamWrite() then - self:close() - self.workingfile=io.open(self.file,'a+') - self.workingfile:write(o.data) - self:close() - self:open() - elseif self.Stream==false then - if not(t) then - self.data=self.data..o.data - else - seld.data=o.data..self.data - end - end -end -function bin:cryptM() - self:flipbits() - self:reverse() -end -function bin.escapeStr(str) - local temp='' - for i=1,#str do - temp=temp..'\\'..string.byte(string.sub(str,i,i)) - end - return temp -end - -function bin.ToStr(val, name, skipnewlines, depth) - skipnewlines = skipnewlines or false - depth = depth or 0 - local tmp = string.rep(" ", depth) - if name then - if type(name) == "string" then - tmp = tmp .. "[\""..name.."\"] = " - else - tmp = tmp .. "["..(name or "").."] = " - end - end - if type(val) == "table" then - tmp = tmp .. "{" .. (not skipnewlines and " " or "") - for k, v in pairs(val) do - tmp = tmp .. bin.ToStr(v, k, skipnewlines, depth + 1) .. "," .. (not skipnewlines and " " or "") - end - tmp = tmp .. string.rep(" ", depth) .. "}" - elseif type(val) == "number" then - tmp = tmp .. tostring(val) - elseif type(val) == "string" then - tmp = tmp .. string.format("%q", val) - elseif type(val) == "boolean" then - tmp = tmp .. (val and "true" or "false") - else - tmp = tmp .. "\"[inserializeable datatype:" .. type(val) .. "]\"" - end - return tmp -end -function bin:addBlock(d,n,e) - local temp={} - if type(d)=='table' then - if d.t=='bin' then - temp=d - elseif d.t=='bit' then - temp=bin.new(d:tobytes()) - else - self:addBlock('return '..bin.ToStr(d)) - return - end - elseif type(d)=='string' then - temp=bin.new(d) - if e or not(n) then - temp.data=temp.data..'_EOF' - temp:flipbits() - end - elseif type(d)=='function' then - temp=bin.new(string.dump(d)) - if e or not(n) then - temp.data=temp.data..'_EOF' - temp:flipbits() - end - elseif type(d)=='number' then - local nn=tostring(d) - if nn:find('.',1,true) then - temp=bin.new(nn) - temp.data=temp.data..'_EOF' - temp:flipbits() - else - temp=bits.new(d):tobytes() - if not n then - temp.data=temp.data..'_EOF' - temp:flipbits() - end - end - elseif type(d)=='boolean' then - n=1 - if d then - temp=bits.new(math.random(0,127)):tobytes() - else - temp=bits.new(math.random(128,255)):tobytes() - end - end - if n then - if temp:getlength()n then - temp:segment(1,n) - end - end - self:merge(temp) -end -function bin:getBlock(t,n,se) - if not(self.Block) then - self.Block=1 - end - local x=self.Block - local temp=bin.new() - if n then - temp=bin.new(self:sub(x,x+n-1)) - self.Block=self.Block+n - end - if se then - self.Block=self.Block+se - end - if t=='stringe' or t=='stre' or t=='se' and n then - temp:flipbits() - bin.lastBlockSize=#temp - return temp.data - elseif t=='string' or t=='str' or t=='s' and n then - bin.lastBlockSize=#temp - return temp.data - elseif t=='number' or t=='num' or t=='n' and n then - bin.lastBlockSize=n - return self:tonumber(x,x+n-1) - elseif t=='boolean' or t=='bool' or t=='b' then - self.Block=self.Block+1 - bin.lastBlockSize=1 - return self:tonumber(x,x)<127 - elseif t=='stringe' or t=='stre' or t=='se' or t=='string' or t=='str' or t=='s' then - local a,b=self:scan('_EOF',self.Block,true) - if not(b) then return nil end - local t=bin.new(self:sub(self.Block,b-4)) - bin.lastBlockSize=t:getlength() - t:flipbits() - self.Block=self.Block+t:getlength()+4 - return tostring(t) - elseif t=='table' or t=='tab' or t=='t' then - temp=self:getBlock('s') - bin.lastBlockSize=#temp - return assert(loadstring(temp))() - elseif t=='function' or t=='func' or t=='f' then - local temp=self:getBlock('s') - bin.lastBlockSize=#temp - return assert(loadstring(temp)) - elseif t=='number' or t=='num' or t=='n' then - local num=bin.new(self:getBlock('s')) - bin.lastBlockSize=#num - if tonumber(num.data) then - return tonumber(num.data) - end - local a,b=num:tonumber() - return a - elseif n then - -- C data - else - print('Invalid Args!!!') - end -end -function bin:seek(n) - self.Block=self.Block+n -end -function bin.NumtoHEX(num) - local hexstr = '0123456789ABCDEF' - local s = '' - while num > 0 do - local mod = math.fmod(num, 16) - s = string.sub(hexstr, mod+1, mod+1) .. s - num = math.floor(num / 16) - end - if s == '' then - s = '0' - end - return s -end -function bin:getHEX(a,b,e) - a=a or 1 - local temp = self:sub(a,b) - if e then temp=string.reverse(temp) end - return bin.tohex(temp) -end -function bin.HEXtoBin(hex,e) - if e then - return bin.new(string.reverse(bin.fromhex(hex))) - else - return bin.new(bin.fromhex(hex)) - end -end -function bin.HEXtoStr(hex,e) - if e then - return string.reverse(bin.fromhex(hex)) - else - return bin.fromhex(hex) - end -end -function bin:morph(a,b,d) - if self:canStreamWrite() then - local len=self:getlength() - local temp=bin.newTempFile(self:sub(b+1,self:getlength())) - self:streamwrite(d,a-1) - print(temp:sub(1,temp:getlength())) - self:setEndOfFile(len+(b-a)+#d) - self:streamwrite(temp:sub(1,temp:getlength()),a-1) - temp:remove() - elseif self.Stream==false then - if a and b then - self.data=self:sub(1,a-1)..d..self:sub(b+1) - else - print('error both arguments must be numbers and the third a string') - end - end -end -function bin.endianflop(data) - return string.reverse(data) -end -function bin:scan(s,n,f) - n=n or 1 - if self.Stream then - for i=n,self:getlength() do - if f then - local temp=bin.new(self:sub(i,i+#s-1)) - temp:flipbits() - if temp.data==s then - return i,i+#s-1 - end - else - if self:sub(i,i+#s-1)==s then - return i,i+#s-1 - end - end - end - elseif self.Stream==false then - if f then - s=bin.new(s) - s:flipbits() - s=s.data - end - n=n or 1 - local a,b=string.find(self.data,s,n,true) - return a,b - end -end -function bin:fill(s,n) - if self:canStreamWrite() then - self:streamwrite(string.rep(s,n),0) - self:setEndOfFile(n*#s) - elseif self.Stream==false then - self.data=string.rep(s,n) - end -end -function bin:fillrandom(n) - if self:canStreamWrite() then - local t={} - for i=1,n do - table.insert(t,string.char(math.random(0,255))) - end - self:streamwrite(table.concat(t),0) - self:setEndOfFile(n) - elseif self.Stream==false then - local t={} - for i=1,n do - table.insert(t,string.char(math.random(0,255))) - end - self.data=table.concat(t) - end -end -function bin.packLLIB(name,tab,ext) - local temp=bin.new() - temp:addBlock('') - temp:addBlock(bin.getVersion()) - temp:addBlock(tab) - for i=1,#tab do - temp:addBlock(tab[i]) - temp:addBlock(bin.load(tab[i]).data) - end - temp:addBlock('Done') - temp:tofile(name.. ('.'..ext or '.llib')) -end -function bin.unpackLLIB(name,exe,todir,over,ext) - local temp=bin.load(name..('.'..ext or '.llib')) - local name='' - Head=temp:getBlock('s') - ver=temp:getBlock('s') - infiles=temp:getBlock('t') - if ver~=bin.getVersion() then - print('Incompatable llib file') - return nil - end - local tab={} - while name~='Done' do - name,data=temp:getBlock('s'),bin.new(temp:getBlock('s')) - if string.find(name,'.lua',1,true) then - table.insert(tab,data.data) - else - if not(bin.fileExist((todir or '')..name) and not(over)) then - data:tofile((todir or '')..name) - end - end - end - os.remove((todir or '')..'Done') - if exe then - for i=1,#tab do - assert(loadstring(tab[i]))() - end - end - return infiles -end -function bin.fileExist(path) - g=io.open(path or '','r') - if path =='' then - p='empty path' - return nil - end - if g~=nil and true or false then - p=(g~=nil and true or false) - end - if g~=nil then - io.close(g) - else - return false - end - return p -end -function bin:shiftbits(n) - if self:canStreamWrite() then - n=n or 0 - if n>=0 then - for i=0,self:getlength() do - print(string.byte(self:sub(i,i))+n%256) - self:streamwrite(string.char(string.byte(self:sub(i,i))+n%256),i-1) - end - else - n=math.abs(n) - for i=0,self:getlength() do - self:streamwrite(string.char((string.byte(self:sub(i,i))+(256-n%256))%256),i-1) - end - end - elseif self.Stream==false then - n=n or 0 - if n>=0 then - for i=1,self:getlength() do - self:morph(i,i,string.char(string.byte(self:sub(i,i))+n%256)) - end - else - n=math.abs(n) - for i=1,self:getlength() do - self:morph(i,i,string.char((string.byte(self:sub(i,i))+(256-n%256))%256)) - end - end - end -end -function bin:shiftbit(n,i) - if self:canStreamWrite() then - i=i-1 - n=n or 0 - if n>=0 then - print((string.byte(self:sub(i,i))+n)%256,n) - self:streamwrite(string.char((string.byte(self:sub(i,i))+n)%256),i-1) - else - n=math.abs(n) - print((string.byte(self:sub(i,i))+(256-n))%256,n) - self:streamwrite(string.char((string.byte(self:sub(i,i))+(256-n%256))%256),i-1) - end - elseif self.Stream==false then - n=n or 0 - if n>=0 then - self:morph(i,i,string.char((string.byte(self:sub(i,i))+n)%256)) - else - n=math.abs(n) - self:morph(i,i,string.char((string.byte(self:sub(i,i))+(256-n%256))%256)) - end - end -end -function bin.decodeBits(par) - if type(par)=='table' then - if par.t=='bit' then - return bin.new(par:toSbytes()) - end - else - if par:find(' ') then - par=par:gsub(' ','') - end - local temp=bits.new() - temp.data=par - return bin.new((temp:toSbytes()):reverse()) - end -end -function bin.textToBinary(txt) - return bin.new(bits.new(txt:reverse()):getBin()) -end -function bin:getData() - if self.Stream then - return self:sub(1,self:getSize()) - else - return self.data - end -end -function bin.getLuaVersion() - if type(jit)=="table" then - if jit.version then - return "JIT",jit.version - end - end - return "PUC",_VERSION:match("(%d-)%.(%d+)") -end -function bin.binToBuffer(b) - return bin:newDataBuffer(b.data) -end -function bin.bufferToBin(b) - return bin.new(b:getBuffer()) -end -function bin.newNamedBlock(indexSize) - local c={} - c.data=bin.new() - c.lastLoc=0 - if indexSize then - indexSize=indexSize+4 - end - c.index=bin:newDataBuffer(indexSize) - c.conv={ - ["n"]="\1", - ["b"]="\2", - ["s"]="\3", - ["t"]="\4", - ["f"]="\5" - } - if indexSize then - c.index:fillBuffer(bits.numToBytes(indexSize,4),1) - c.lastLoc=4 - else - --c.index:fillBuffer(bits.numToBytes(2048,4),1) - end - function c:tofile(path) - bin.new(self:tostring()):tofile(path) - end - function c:tostring() - c.index:fillBuffer(bits.numToBytes(c.index:getSize()-4,4),1) - return self.index:getBuffer()..self.data.data - end - function c:setPointer(name,data,t) - t=c.conv[t] - data=t..data - local dSize=#data - local index=bin:newDataBuffer() - local nLen=#name - local test="" - index:fillBuffer(bits.numToBytes(self.data:getSize()+1,4),1) - index:fillBuffer(name,5) - self.data:tackE(data) - test=self.index:fillBuffer(index:getBuffer().."\31",self.lastLoc+1) - self.lastLoc=self.lastLoc+1+index:getBufferSize() - if test=="Buffer Overflow!" then - error("Increase Index size!") - end - end - function c:addNamedBlock(name,value) - local bSize=#name - local ftype={} - if type(value)=="number" then - local dat=bits.numToBytes(value,8) -- makes 64 bit version of lua compatable - self:setPointer(name,dat,"n") - elseif type(value)=="boolean" then - if value then - self:setPointer(name,"1","b") - else - self:setPointer(name,"0","b") - end - elseif type(value)=="string" then - self:setPointer(name,value,"s") - elseif type(value)=="table" then - local str=bin.ToStr(value) - self:setPointer(name,str,"t") - elseif type(value)=="function" then - local ver,verM,verm=bin.getLuaVersion() - local data=string.dump(value) - if ver=="JIT" then - ftype=bin:newDataBuffer(bits.numToBytes(0,4)) -- luajit version - else - ftype=bin:newDataBuffer(bits.numToBytes(tonumber(verM..verm),4)) -- lua version with MajorMinor data - end - local fdata=bin.new() - fdata:tackE(ftype:getBuffer()..data) - self:setPointer(name,fdata.data,"f") - elseif type(value)=="userdata" then - error("Userdata cannot be put into a block!") - end - end - if not indexSize then - c:addNamedBlock("__UNBOUNDEDINDEX__",true) - end - return c -end -function bin.newStreamedNamedBlock(indexSize,path,update) - local c={} - c.data=bin.stream(path,false) - c.lastLoc=4 - c.conv={ - ["n"]="\1", - ["b"]="\2", - ["s"]="\3", - ["t"]="\4", - ["f"]="\5" - } - if not update then - c.data:tackE(bin:newDataBuffer(indexSize+4 or 2052):getBuffer()) - if indexSize then - c.data:mutate(bits.numToBytes(indexSize,4),1) - else - c.data:mutate(bits.numToBytes(2048,4),1) - end - c.indexSize=indexSize+4 or 2052 - else - c.indexSize=c.data:tonumber(1,4) - local i=bin.new(c.data:sub(5,c.indexSize+4)).data - local last=0 - for b=#i,1,-1 do - if i:sub(b,b)=="\31" then - last=b+4 - break - end - end - c.lastLoc=last - end - function c:tofile(path) - --No need when using a streamed block - end - function c:tostring() - return self.index:getBuffer()..self.data.data - end - function c:setPointer(name,data,t) - t=c.conv[t] - data=t..data - local dSize=#data - local index=bin:newDataBuffer() - local nLen=#name - local test="" - index:fillBuffer(bits.numToBytes((self.data:getSize()+1)-self.indexSize,4),1) - index:fillBuffer(name,5) - local test=self.data:mutate(index:getBuffer().."\31",self.lastLoc+1) - self.lastLoc=self.lastLoc+1+index:getBufferSize() - self.data:tackE(data) - if test=="Buffer Overflow!" then - error("Increase Index size!") - end - end - function c:addNamedBlock(name,value) - local bSize=#name - local ftype={} - if type(value)=="number" then - local dat=bits.numToBytes(value,8) -- makes 64 bit version of lua compatable - self:setPointer(name,dat,"n") - elseif type(value)=="boolean" then - if value then - self:setPointer(name,"1","b") - else - self:setPointer(name,"0","b") - end - elseif type(value)=="string" then - self:setPointer(name,value,"s") - elseif type(value)=="table" then - local str=bin.ToStr(value) - self:setPointer(name,str,"t") - elseif type(value)=="function" then - local ver,verM,verm=bin.getLuaVersion() - local data=string.dump(value) - if ver=="JIT" then - ftype=bin:newDataBuffer(bits.numToBytes(0,4)) -- luajit version - else - ftype=bin:newDataBuffer(bits.numToBytes(tonumber(verM..verm),4)) -- lua version with MajorMinor data - end - local fdata=bin.new() - fdata:tackE(ftype:getBuffer()..data) - self:setPointer(name,fdata.data,"f") - elseif type(value)=="userdata" then - error("Userdata cannot be put into a block!") - end - end - function c:close() - self:addNamedBlock("",false) - self.data:close() - end - return c -end -function bin.loadNamedBlock(path) - local c={} - c.data=bin.stream(path) - c.iSize=c.data:tonumber(1,4) - c.index=bin.new(c.data:sub(5,c.iSize+4)) - c.sData=bin.new(c.data:sub(c.iSize+5,-1)) - function c:CheckRestOfIndex(name) - local a,b=self.index:scan(name) - local d=self.index:tonumber(b+2,b+5) - if d==0 or b+5>self.iSize then - return -1 - end - return d - end - function c:getIndexes() - local tab={} - ind=5 - while ind do - local a=self.index:find("\31",ind) - if not a then break end - local b=self.index:sub(ind,a-1) - table.insert(tab,b) - ind=a+5 - end - return tab - end - function c:getBlock(name) - local a,b=self.index:scan(name) - if not a then return "index not found" end - local dloc=self.index:tonumber(a-4,a-1) - local dindex=bin:newDataBuffer(self.sData:sub(dloc,dloc)) - if dindex[1]==0x01 then -- type number - return self.sData:tonumber(dloc+1,dloc+8) - elseif dindex[1]==0x02 then -- type bool - return ({[1]=true,[0]=false})[tonumber(self.sData:sub(dloc+1,dloc+1))] - elseif dindex[1]==0x03 then -- type string - local dend=self:CheckRestOfIndex(name)--self.index:tonumber(b+2,b+5) - return self.sData:sub(dloc+1,dend-1) - elseif dindex[1]==0x04 then -- type table - local dend=self.index:tonumber(b+2,b+5) - return loadstring("return "..self.sData:sub(dloc+1,dend-1))() - elseif dindex[1]==0x05 then -- type function - local dend=self:CheckRestOfIndex(name)--self.index:tonumber(b+2,b+5) - local _ver=self.sData:tonumber(dloc+1,dloc+4) - local ver,verM,verm=bin.getLuaVersion() - if tonumber(verM..verm)==_ver then - return loadstring(self.sData:sub(dloc+5,dend-1)) - else - return function() error("This lua function is not compatible with the current version of lua!") end - end - end - end - return c -end -function bin.namedBlockManager(name) - if type(name)=="string" then - local i={} - local data=bin.loadNamedBlock(name) - local mt={ - __index=function(t,k) - return data:getBlock(k) - end, - } - setmetatable(i,mt) - return i - else - local i={} - local data=bin.newNamedBlock(name) - local mt={ - __newindex=function(t,k,v) - data:addNamedBlock(k,v) - end, - __index=data - } - setmetatable(i,mt) - return i - end -end -function bin.getIndexSize(tab) - size=0 - for i=1,#tab do - size=size+#tab[i]+5 - end - return size+5 -end -function bin.gcd( m, n ) - while n ~= 0 do - local q = m - m = n - n = q % n - end - return m -end -function bin.numToFraction(num) - num=num or error("Must enter a number!") - local n=#tostring(num) - num=num*(10^n) - local d=(10^n) - local g=bin.gcd(num,d) - return tostring(num/g).."/"..tostring(d/g),num/g,d/g -end -function bin.doubleToString(double) - local s=({[false]="-",[true]="+"})[double>=0] - double=math.abs(double) - local _,n,d=bin.numToFraction(double) - gfit=4 - local a=bits.numToBytes(n,gfit,function(ref) - ref.fit=12 -- should be able to pack any number into that space - ref.num=string.rep("\0",12-#ref.num)..ref.num - if s=="-" then - s="_" - else - s="=" - end - gfit=12 - end) - local b=bits.numToBytes(d,gfit) - return s..a..b -end -function bin.stringToDouble(str) - local s=str:sub(1,1) - if #str~=9 and #str~=25 then - if s~="-" and s~="+" and s~="_" and s~="=" then - print(s) - error("Not a double encoded string") - end - error("Not a double encoded string") - end - local n,d - if s=="_" or s=="=" then - n,d=str:sub(2,13),str:sub(14) - else - n,d=str:sub(2,5),str:sub(6) - end - local n=bin.new(n):tonumber() - local d=bin.new(d):tonumber() - local num=n/d - if s=="-" or s=="_" then - num=-num - end - return num -end ---[[---------------------------------------- -VFS -------------------------------------------]] -local _require = require -function require(path,vfs) - if bin.fileExist(path..'.lvfs') then - local data = bin.loadVFS(path..'.lvfs') - if data:fileExist(vsf) then - loadstring(data:readFile(vfs))() - end - else - return _require(path) - end -end -function bin.loadVFS(path) - local vfs=bin.newVFS() - local temp=bin.stream(path,false) - local files=temp:getBlock("t") - local size=0 - for i=1,#files do - local p,len=files[i]:match("(.-)|(.+)") - len=tonumber(len) - size=size+bin.lastBlockSize - local dat=temp:sub(size+5,size+len+4) - bin.lastBlockSize=len - vfs:mkfile(p:gsub("%./",""),dat) - end - return vfs -end -function bin.copyDir(dir,todir) - local vfs=bin.newVFS(dir,true) - vfs:toFS(todir) - vfs=nil -end -function bin.newVFS(t,l) - l=l or true - if type(t)=='string' then - t=io.parseDir(t,l) - end - local c={} - c.FS= t or {} - function c:merge(vfs) - bin.newVFS(table.merge(self.FS,vfs.FS)) - end - function c:mirror(file) - self:mkfile(file,file) - end - function c:mkdir(path) - table.merge(self.FS,io.pathToTable(path)) - end - function c:scanDir(path) - path=path or '' - local tab={} - if path=='' then - for i,v in pairs(self.FS) do - tab[#tab+1]=i - end - return tab - end - spath=io.splitPath(path) - local last=self.FS - for i=1,#spath-1 do - last=last[spath[i]] - end - return last[spath[#spath]] - end - function c:getFiles(path) - if not self:dirExist(path) then return end - path=path or '' - local tab={} - if path=='' then - for i,v in pairs(self.FS) do - if self:fileExist(i) then - tab[#tab+1]=i - end - end - return tab - end - spath=io.splitPath(path) - local last=self.FS - for i=1,#spath-1 do - last=last[spath[i]] - end - local t=last[spath[#spath]] - for i,v in pairs(t) do - if self:fileExist(path..'/'..i) then - tab[#tab+1]=path..'/'..i - end - end - return tab - end - function c:getDirectories(path) - if not self:dirExist(path) then return end - path=path or '' - local tab={} - if path=='' then - for i,v in pairs(self.FS) do - if self:dirExist(i) then - tab[#tab+1]=i - end - end - return tab - end - spath=io.splitPath(path) - local last=self.FS - for i=1,#spath-1 do - last=last[spath[i]] - end - local t=last[spath[#spath]] - for i,v in pairs(t) do - if self:dirExist(path..'/'..i) then - tab[#tab+1]=path..'/'..i - end - end - return tab - end - function c:mkfile(path,data) - local name=io.getFullName(path) - local temp=path:reverse() - local a,b=temp:find('/') - if not a then - a,b=temp:find('\\') - end - if a then - temp=temp:sub(a+1):reverse() - path=temp - local t,l=io.pathToTable(path) - l[name]=data - table.merge(self.FS,t) - else - self.FS[name]=data - end - end - function c:remove(path) - if path=='' or path==nil then return end - spath=io.splitPath(path) - local last=self.FS - for i=1,#spath-1 do - last=last[spath[i]] - end - last[spath[#spath]]=nil - end - function c:readFile(path) - spath=io.splitPath(path) - local last=self.FS - for i=1,#spath do - last=last[spath[i]] - end - if type(last)=='userdata' then - last=last:read('*all') - end - return last - end - function c:copyFile(p1,p2) - self:mkfile(p2,self:readFile(p1)) - end - function c:moveFile(p1,p2) - self:copyFile(p1,p2) - self:remove(p1) - end - function c:fileExist(path) - return type(self:readFile(path))=='string' - end - function c:dirExist(path) - if path=='' or path==nil then return end - spath=io.splitPath(path) - local last=self.FS - for i=1,#spath-1 do - last=last[spath[i]] - end - if last[spath[#spath]]~=nil then - if type(last[spath[#spath]])=='table' then - return true - end - end - return false - end - function c:_getHierarchy() - local ord={} - local datlink=bin.new() - local function toStr(val, name, skipnewlines, depth, path) - skipnewlines = skipnewlines or false - path=path or "." - depth = depth or 0 - local tmp = string.rep(" ", depth) - if name then - if type(name) == "string" then - tmp = tmp .. "[\""..name.."\"] = " - else - tmp = tmp .. "["..(name or "").."] = " - end - end - if type(val) == "table" then - tmp = tmp .. "{" .. (not skipnewlines and "\n" or "") - for k, v in pairs(val) do - tmp = tmp .. toStr(v, k, skipnewlines, depth + 1,path.."/"..k) .. "," .. (not skipnewlines and "\n" or "") - end - tmp = tmp .. string.rep(" ", depth) .. "}" - elseif type(val) == "string" then - tmp = tmp .. #val - datlink:tackE(val) - ord[#ord+1]=path.."|"..#val - end - return tmp - end - return toStr(self.FS),ord,datlink - end - function c:getHierarchy() - local ord={} - local function toStr(val, name, skipnewlines, depth, path) - skipnewlines = skipnewlines or false - path=path or "." - depth = depth or 0 - local tmp = string.rep(" ", depth) - if name then - if type(name) == "string" then - tmp = tmp .. "[\""..name.."\"] = " - else - tmp = tmp .. "["..(name or "").."] = " - end - end - if type(val) == "table" then - tmp = tmp .. "{" .. (not skipnewlines and "\n" or "") - for k, v in pairs(val) do - tmp = tmp .. toStr(v, k, skipnewlines, depth + 1,path.."/"..k) .. "," .. (not skipnewlines and "\n" or "") - end - tmp = tmp .. string.rep(" ", depth) .. "}" - elseif type(val) == "string" then - tmp = tmp .. ";" - ord[#ord+1]=path.."|"..#val - end - return tmp - end - return toStr(self.FS),ord - end - function c:tofile(path) - local temp=bin.new() - local h,o,link=self:_getHierarchy() - temp:addBlock(o) - temp:merge(link) - temp:tofile(path) - end - function c:toFS(path) - if path then - if path:sub(-1,-1)~='\\' then - path=path..'\\' - elseif path:find('/') then - path=path:gsub('/','\\') - end - io.mkDir(path) - else - path='' - end - function build(tbl, indent, folder) - if not indent then indent = 0 end - if not folder then folder = '' end - for k, v in pairs(tbl) do - formatting = string.rep(' ', indent) .. k .. ':' - if type(v) == 'table' then - if v.t~=nil then - io.mkFile(folder..k,tostring(v),'wb') - else - if not(io.dirExists(path..folder..string.sub(formatting,1,-2))) then - io.mkDir(folder..string.sub(formatting,1,-2)) - end - build(v,0,folder..string.sub(formatting,1,-2)..'\\') - end - elseif type(v)=='string' then - io.mkFile(folder..k,v,'wb') - elseif type(v)=='userdata' then - io.mkFile(folder..k,v:read('*all'),'wb') - end - end - end - build(self.FS,0,path) - end - function c:print() - table.print(self.FS) - end - return c -end ---[[---------------------------------------- -BITS -------------------------------------------]] -function bits.lsh(value,shift) - return (value*(2^shift)) % 256 -end -function bits.rsh(value,shift) - return math.floor(value/2^shift) % 256 -end -function bits.bit(x,b) - return (x % 2^b - x % 2^(b-1) > 0) -end -function bits.lor(x,y) - result = 0 - for p=1,8 do result = result + (((bits.bit(x,p) or bits.bit(y,p)) == true) and 2^(p-1) or 0) end - return result -end -function bits.newBitBuffer(n) - -- -end -function bits.newConverter(bitsIn,bitsOut) - local c={} - -- -end -bits.ref={} -function bits.newByte(d) - local c={} - if type(d)=="string" then - if #d>1 or #d<1 then - error("A byte must be one character!") - else - c.data=string.byte(d) - end - elseif type(d)=="number" then - if d>255 or d<0 then - error("A byte must be between 0 and 255!") - else - c.data=d - end - else - error("cannot use type "..type(d).." as an argument! Takes only strings or numbers!") - end - c.__index=function(self,k) - if k>=0 and k<9 then - if self.data==0 then - return 0 - elseif self.data==255 then - return 1 - else - return bits.ref[self.data][k] - end - end - end - c.__tostring=function(self) - return bits.ref[tostring(self.data)] - end - setmetatable(c,c) - return c -end -function bits.newByteArray(s) - local c={} - if type(s)~="string" then - error("Must be a string type or bin/buffer type") - elseif type(s)=="table" then - if s.t=="sink" or s.t=="buffer" or s.t=="bin" then - local data=s:getData() - for i=1,#data do - c[#c+1]=bits.newByte(data:sub(i,i)) - end - else - error("Must be a string type or bin/buffer type") - end - else - for i=1,#s do - c[#c+1]=bits.newByte(s:sub(i,i)) - end - end - return c -end -function bits.new(n,s) - if type(n)=='string' then - local t=tonumber(n,2) - if t and #n<8 and not(s) then - t=nil - end - if not(t) then - t={} - for i=#n,1,-1 do - table.insert(t,bits:conv(string.byte(n,i))) - end - n=table.concat(t) - else - n=t - end - end - local temp={} - temp.t='bit' - setmetatable(temp, bits) - if type(n)~='string' then - local tab={} - while n>=1 do - table.insert(tab,n%2) - n=math.floor(n/2) - end - local str=string.reverse(table.concat(tab)) - if #str%8~=0 then - str=string.rep('0',8-#str%8)..str - end - temp.data=str - else - temp.data=n - end - setmetatable({__tostring=function(self) return self.data end},temp) - return temp -end -for i=0,255 do - local d=bits.new(i).data - bits.ref[i]={d:match("(%d)(%d)(%d)(%d)(%d)(%d)(%d)(%d)")} - bits.ref[tostring(i)]=d - bits.ref[d]=i - bits.ref["\255"..string.char(i)]=d -end -function bits.numToBytes(n,fit,func) - local num=bits.new(n):toSbytes() - num=bin.endianflop(num) - local ref={["num"]=num,["fit"]=fit} - if fit then - if fit<#num then - if func then - print("Warning: attempting to store a number that takes up more space than allotted! Using provided method!") - func(ref) - else - print("Warning: attempting to store a number that takes up more space than allotted!") - end - return ref.num:sub(1,ref.fit) - elseif fit==#num then - return num - else - return string.rep("\0",fit-#num)..num - end - else - return num - end -end -function bits:conv(n) - local tab={} - while n>=1 do - table.insert(tab,n%2) - n=math.floor(n/2) - end - local str=string.reverse(table.concat(tab)) - if #str%8~=0 then - str=string.rep('0',8-#str%8)..str - end - return str -end -function bits:add(i) - if type(i)=='number' then - i=bits.new(i) - end - self.data=self:conv(tonumber(self.data,2)+tonumber(i.data,2)) -end -function bits:sub(i) - if type(i)=='number' then - i=bits.new(i) - end - self.data=self:conv(tonumber(self.data,2)-tonumber(i.data,2)) -end -function bits:multi(i) - if type(i)=='number' then - i=bits.new(i) - end - self.data=self:conv(tonumber(self.data,2)*tonumber(i.data,2)) -end -function bits:div(i) - if type(i)=='number' then - i=bits.new(i) - end - self.data=self:conv(tonumber(self.data,2)/tonumber(i.data,2)) -end -function bits:tonumber(s) - if type(s)=='string' then - return tonumber(self.data,2) - end - s=s or 1 - return tonumber(string.sub(self.data,(8*(s-1))+1,8*s),2) or error('Bounds!') -end -function bits:isover() - return #self.data>8 -end -function bits:flipbits() - tab={} - for i=1,#self.data do - if string.sub(self.data,i,i)=='1' then - table.insert(tab,'0') - else - table.insert(tab,'1') - end - end - self.data=table.concat(tab) -end -function bits:tobytes() - local tab={} - for i=self:getbytes(),1,-1 do - table.insert(tab,string.char(self:tonumber(i))) - end - return bin.new(table.concat(tab)) -end -function bits:toSbytes() - local tab={} - for i=self:getbytes(),1,-1 do - table.insert(tab,string.char(self:tonumber(i))) - end - return table.concat(tab) -end -function bits:getBin() - return self.data -end -function bits:getbytes() - return #self.data/8 -end diff --git a/examples/love2d Threading Example/core/lovebind.lua b/examples/love2d Threading Example/core/lovebind.lua deleted file mode 100644 index eca6618..0000000 --- a/examples/love2d Threading Example/core/lovebind.lua +++ /dev/null @@ -1,103 +0,0 @@ -os.sleep=love.timer.sleep -function bin.load(file,s,r) - content, size = love.filesystem.read(file) - local temp=bin.new(content) - temp.filepath=file - return temp -end -function bin:tofile(filename) - if not(filename) or self.Stream then return nil end - love.filesystem.write(filename,self.data) -end -function bin.stream(file,l) - error("Sorry streaming is not available when using love2d :(, I am looking for a solution though :)") -end -function love.run() - if love.math then - love.math.setRandomSeed(os.time()) - end - if love.event then - love.event.pump() - end - if love.load then love.load(arg) end - if love.timer then love.timer.step() end - local dt = 0 - while true do - -- Process events. - if love.event then - love.event.pump() - for e,a,b,c,d in love.event.poll() do - if e == "quit" then - if not love.quit or not love.quit() then - if love.audio then - love.audio.stop() - end - return - end - end - love.handlers[e](a,b,c,d) - end - end - if love.timer then - love.timer.step() - dt = love.timer.getDelta() - end - if love.update then love.update(dt) end - if multi.boost then - for i=1,multi.boost-1 do - multi:uManager(dt) - end - end - multi:uManager(dt) - if love.window and love.graphics and love.window.isCreated() then - love.graphics.clear() - love.graphics.origin() - if love.draw then love.draw() end - multi.dManager() - love.graphics.setColor(255,255,255,255) - if multi.draw then multi.draw() end - love.graphics.present() - end - end -end -multi.drawF={} -function multi:dManager() - for ii=1,#multi.drawF do - multi.drawF[ii]() - end -end -function multi:onDraw(func,i) - i=i or 1 - table.insert(self.drawF,i,func) -end -function multi:lManager() - if love.event then - love.event.pump() - for e,a,b,c,d in love.event.poll() do - if e == "quit" then - if not love.quit or not love.quit() then - if love.audio then - love.audio.stop() - end - return nil - end - end - love.handlers[e](a,b,c,d) - end - end - if love.timer then - love.timer.step() - dt = love.timer.getDelta() - end - if love.update then love.update(dt) end - multi:uManager(dt) - if love.window and love.graphics and love.window.isCreated() then - love.graphics.clear() - love.graphics.origin() - if love.draw then love.draw() end - multi.dManager() - love.graphics.setColor(255,255,255,255) - if multi.draw then multi.draw() end - love.graphics.present() - end -end diff --git a/examples/love2d Threading Example/core/net/Documentation.txt b/examples/love2d Threading Example/core/net/Documentation.txt deleted file mode 100644 index 462add6..0000000 --- a/examples/love2d Threading Example/core/net/Documentation.txt +++ /dev/null @@ -1,106 +0,0 @@ -Hey guys, I am currently working on a net library which aims to make Async servers/clients a piece of cake. It is still in heavy development, but a release will be made soon. The basic features are done and work great. The modules are being worked on though. -Right now I have the core and 4 modules finished -+CORE <-- The base library -+net.identity <-- makes registration and login for users seamless -+net.sft <-- a Simple File Transfer module. -NOTE: Once net.aft Is complete net.sft will no longer be supported -+net.aft <-- an Advanced File Transfer module. -NOTE: As of right now user can only download files in aft -+net.chatting <-- allows for chatting between users - -I will go into detail on how the core and 'stable' modules work - - -[color=#FF0000][b]Creating A Server[/b][/color] -EXAMPLE:1 -[code] ---[[Filename: server.lua -+Dependencies: -+the net library -+the bin library -+the multimanager library -+luasocket - -I suggest using luajit when creating the server for that extra boost in performance! -]] - -require("net") --- All you need is a port for the server init -server=net:newServer(12345) ---server=net:newTCPServer(12345) - ---[[The commented line above creates a TCP server -CID: Client ID, unique for each user connected to the server. If you are using a TCP Server then you get the handle used for communication -IP_OR_HANDLE, works much like CID_OR_HANDLE, where you get a handle if using TCP -The reason for this is so modules could be made for both types of servers and work flawlessly, The only exception is the sft and aft module, TCP is recommended to ensure things are sent in order -PORT_OR_IP is like the above as well... Think of it this way UDP_TCP for each argument -]] - -server:OnDataRecived(function(serv,data,CID_OR_HANDLE,IP_OR_HANDLE,PORT_OR_IP) - if data=="Hello Server!" then -- the client say hi lets say something back - serv:send(IP_OR_HANDLE,"Hey client!",PORT_OR_IP,CID_OR_HANDLE)-- cid only needs to be passed for UDP Servers, you can exclude the cid argument if you want though. The server stores ports and IPs for each CID while they are logged on! - end -end) -multi:mainloop() -[/code] - -This is the basic setup for a server where you can send data back and forth. Note: modules that receive data will bypass triggering this event to save CPU time... Only events that are important get triggered If you want to speed up your code and make your event triggered when data you want gets passed use "!eventname! ...rest_of_your_data_here" - -For example You would do this: -EXAMPLE:2 -[code] ---[[ -Assume your client is sending this data: "!gamedata! MOVE bob 10 10" -take a look at the new server OnDataRecieved event -]] - -require("net") -server=net:newServer(12345) -world={["bob"]={x=0,y=0}} -server:OnDataRecived(function(serv,data,CID_OR_HANDLE,IP_OR_HANDLE,PORT_OR_IP) - local cmd,entity,arg1,arg2=data:match("!gamedata! (%S+) (%S+) (%S+) (%S+)") - if cmd=="MOVE" then - --lets move bob - world[entity].x=tonumber(arg1) - world[entity].y=tonumber(arg2) - --Now lets tell every client connected what happened - serv:sendAll("!gamedata! UPDATE "..entity.." "..arg1.." "..arg2) -- note only data is needed now! - end -end,"gamedata") -- notice this string right here it allows the CORE to know that you should call this when !gamedata! is within a method. This is useful especally when you have many connections to the server OnDataRecieved event -multi:mainloop() -[/code] - -Now that was fun... But what if I'm sending binary data over to the client... Doesn't non-ASCII tend to get messed up? -Yes it does and even when using TCP data tends to not always transfer right - -net.normalize(data) converts data into all ASCII characters to keep your data safe, so even binary data can be passed. Since this uses base64 encoding every 3 characters become 4 so your data size becomes a bit bigger. To avoid problems keep all data being normalized data under 384 characters! The data here is converted into 512 bytes. -net.denormalize(data) takes the normalized and converts it back to what it was originally. - -Take a look at this example -EXAMPLE:3 -[code] ---Assume your client is sending this data: "!gamedata! MSG bob NORMILZED_MSG NIL" empty data so pattern matches - -require("net") -function CheckMSG(data) - -- TODO: modify the message for things that break our rules - returns data -end -server=net:newServer(12345) -world={["bob"]={x=0,y=0}} -server:OnDataRecived(function(serv,data,CID_OR_HANDLE,IP_OR_HANDLE,PORT_OR_IP) - local cmd,entity,arg1,arg2=data:match("!gamedata! (%S+) (%S+) (%S+) (%S+)") - if cmd=="MOVE" then - --lets move bob - world[entity].x=tonumber(arg1) -- we are sending the numbers as binary data - world[entity].y=tonumber(arg2) - --Now lets tell every client connected what happened - serv:sendAll("!gamedata! UPDATE "..entity.." "..arg1.." "..arg2) -- note only data is needed now! - elseif cmd=="MSG" then -- client is sending a message NOTE: I have a module that handles chatting however for example sake here is a simple chat message - --Lets look at the data We normalize the data because we can have \n characters in the data and TCP/UDP are line based so that would mess up packets! - local msg=CheckMSG(net.denormalize(arg1)) - serv:sendAll("!gamedata! MSG "..entity.." "..msg.." NIL") - end -end,"gamedata") -- notice this string right here it allows the CORE to know that you should call this when !gamedata! is within a method. This is useful especally when you have many connections to the server OnDataRecieved event -multi:mainloop() -[/code] \ No newline at end of file diff --git a/examples/love2d Threading Example/core/net/admin.lua b/examples/love2d Threading Example/core/net/admin.lua deleted file mode 100644 index 886a7f7..0000000 --- a/examples/love2d Threading Example/core/net/admin.lua +++ /dev/null @@ -1,58 +0,0 @@ -require("parseManager") -require("net.identity") -require("net.aft") -net:registerModule("admin",{1,0,0}) --- Localhost does not need to log in to connect to the server and do whatever... This inculdes modules that you are writing for the server --- LAN connections can request data from the server without logging in, but must log in to alter server settings --- WAN connections can only request or alter settings if they are logged in - ---[[ -User levels: 1 - SERVEROWNER/localhost (Autodetect) - 2 - ADMIN - 3 - Modded User - 4 - Privileged User - 5 - Regular User - 6 - Restricted User - 7 - USER DEFINED - 8 - USER DEFINED - 9 - USER DEFINED - 10 - Banned User -]] -if not io.dirExists("-ADMINS-") then - io.mkdir("-ADMINS-") -end -if not io.fileExists("-ADMINS-/LEVELS-List.dat") then - io.mkfile("-ADMINS-/LEVELS-List.dat") -end -net.statuslist={} -net.OnServerCreated:connect(function(s) - s.OnDataRecieved(function(self,data,CID_OR_HANDLE,IP_OR_HANDLE,PORT_OR_IP) - local IP=tonumber(IP_OR_HANDLE) or tonumber(PORT_OR_IP) - end,"admin") - function s:setUserLevel(user,n) - -- - end - function s:makeAdmin(user) - -- - end - function s:makeMod(user) - -- - end - function s:makePrivileged(user) - -- - end - function s:restrict(user) - -- - end - function s:ban(user) - -- - end - function s:getUserLevel(user) - -- - end -end) -net.OnClientCreated:connect(function(c) - c.OnDataRecieved(function(self,data) - -- - end,"admin") -end) diff --git a/examples/love2d Threading Example/core/net/aft.lua b/examples/love2d Threading Example/core/net/aft.lua deleted file mode 100644 index 0ce6c59..0000000 --- a/examples/love2d Threading Example/core/net/aft.lua +++ /dev/null @@ -1,325 +0,0 @@ -require("net") ---General Stuff ---[[ What this module does! -Allows reliable transfer of files over the internet! -Hash testing and piece transfer -TODO: Add uploading support... For now use sft less intensive on the client/server -]] -net:registerModule("aft",{2,1,0}) -net.aft.transfers={} -net.aft.sinks={} -net.aft.cache={} -net.aft.preload={} -net.aft.pieceSize=768 -- max data packet for b64 that can safely be transfered without erroring! DO NOT CHANGE!!! -function net.aft:init() -- calling this initilizes the library and binds it to the servers and clients created - --Server Stuff - net.OnServerCreated:connect(function(s) - print("The aft(Advance File Transfer) Module has been loaded onto the server!") - if s.Type~="tcp" then - print("It is recomended that you use tcp to transfer files!") - end - s.OnUploadRequest=multi:newConnection() -- create an aft event - s.OnDownloadRequest=multi:newConnection() - s.OnClientClosed:connect(function(self,reason,cid,ip,port) - if net.aft.transfers[cid] then - for i,v in pairs(net.aft.transfers[cid]) do - v.resendAlarm:Destroy() - end - net.aft.transfers[cid]=nil - end - end) - function s:preloadFile(name) - net.aft.preload[name]={} - local temp=bin.stream(name) - temp:segmentedRead(768,function(data) - local unpackedDATA1=data:sub(1,384) - local unpackedDATA2=data:sub(385) - local packedDATA=net.normalize(unpackedDATA1)..net.normalize(unpackedDATA2) - table.insert(net.aft.preload,packedDATA) - end) - end - function s:isPreloaded(name) - return net.aft.preload[name]~=nil - end - s.allowSmallFileCaching=false - s.cachable=10 -- 10 MBs - s.OnDataRecieved(function(self,data,cid,ip,port) -- when the server recieves data this method is triggered - local cmd,arg1,arg2=data:match("!aft! (%S+) (%S+) (%S+)") - --print(cmd,arg1,arg2) - if cmd=="PIECE" then - local FID,piecenum=arg1,tonumber(arg2) - local pp=piecenum-1 - net.aft.transfers[cid][FID].resendAlarm:Reset() - if net.aft.transfers[cid][FID] then - if pp>net.aft.transfers[cid][FID].pieces-1 then - self:send(ip,"!aft! DOWNLOAD INVALID_PIECENUM NIL NIL NIL",port) - print("ERROR 101") - else - if self:isPreloaded(name) then - self:send(ip,net.aft.preload[name][piecenum],port) - return - end - if self.allowSmallFileCaching then - if net.aft.cache[net.aft.transfers[cid][FID].name] then - if net.aft.cache[net.aft.transfers[cid][FID].name][piecenum] then - self:send(ip,net.aft.cache[net.aft.transfers[cid][FID].name][piecenum],port) - return - end - end - end - local ddata - local unpackedDATA=net.aft.transfers[cid][FID].sink:sub((pp*net.aft.pieceSize)+1,(pp+1)*net.aft.pieceSize) - local num=#unpackedDATA - if num<384 then - ddata="!aft! TRANS "..piecenum.." "..FID.." | "..net.normalize(unpackedDATA) - else - local unpackedDATA1=unpackedDATA:sub(1,384) - local unpackedDATA2=unpackedDATA:sub(385) - local packedDATA=net.normalize(unpackedDATA1)..net.normalize(unpackedDATA2) - ddata="!aft! TRANS "..piecenum.." "..FID.." | "..packedDATA - end - net.aft.transfers[cid][FID].resendAlarm.piecenum=piecenum - net.aft.transfers[cid][FID].resendAlarm.hash="" -- not needed anymore - net.aft.transfers[cid][FID].resendAlarm.packedDATA=packedDATA - -- SAFE - if self.allowSmallFileCaching then - net.aft.cache[net.aft.transfers[cid][FID].name][piecenum]=ddata - end - self:send(ip,ddata,port) - end - else - self:send(ip,"!aft! DOWNLOAD INVALID_FID NIL NIL NIL",port) - print("ERROR 102") - end - elseif cmd=="UPLOAD" then -- here we set up the spot for file writing - local FID,filename=arg1:match("(.-)|(.+)") - local struct={ - FID=FID, - filename=filename, - numpieces=tonumber(arg2) or -1 - } - if struct.numpieces==-1 then -- error handling catch it all :) - self:send(ip,"!aft! UPLOAD UPLOAD_REFUSED INVALID_NUMBER_OF_PIECES | |",port) - return - end - self.OnUploadRequest:Fire(struct,cid,ip,port) - if not(struct.deny) then -- block request or allow it - -- If we are allowed to lets do this - if not(net.aft.transfers.DOWNLOADS) then - net.aft.transfers.DOWNLOADS={} - end - if not(net.aft.transfers.DOWNLOADS[FID]) then - net.aft.transfers.DOWNLOADS[FID]={} - end - bin.new(""):tofile(struct.filename) - net.aft.transfers.DOWNLOADS[struct.FID].sink=struct.sink or bin.stream(struct.filename,false) - net.aft.transfers.DOWNLOADS[struct.FID].currentPiece=1 - net.aft.transfers.DOWNLOADS[struct.FID].numPieces=tonumber(arg2) - --we got that setup... Lets Request a piece now! - self:send(ip,"!aft! PIECE 1 "..FID.." | |",port) -- request piece # 1 - else - self:send(ip,"!aft! UPLOAD UPLOAD_REFUSED "..(struct.reason or "UNSPECIFIED_ERROR").." | |",port) - end - elseif cmd=="TRANS" then - local FID,piece=arg1:match("(.-)|(.+)") - local piece=tonumber(piece) or -1 - if pieces==-1 then -- error handling catch it all :) - self:send(ip,"!aft! UPLOAD UPLOAD_CANCLED PIECE_DATA_MALFORMED | |",port) - return - end - if #arg2<512 then - net.aft.transfers.DOWNLOADS[FID].sink:tackE(net.denormalize(arg2)) - else - net.aft.transfers.DOWNLOADS[FID].sink:tackE(net.denormalize(arg2:sub(1,512))..net.denormalize(arg2:sub(513))) - end - -- request the next piece - if piece==net.aft.transfers.DOWNLOADS[FID].numPieces then - -- We are done! - self:send(ip,"!aft! DONE "..FID.." | | |",port) - net.aft.transfers.DOWNLOADS[FID].sink:close() -- close the file - else - self:send(ip,"!aft! PIECE "..piece+1 .." "..FID.." | |",port) - end - elseif cmd=="REQUEST" then - local filename=arg1 - local struct={ - filename=filename - } - self.OnDownloadRequest:Fire(self,struct) - if io.fileExists(struct.filename) or struct.handle then - local FID=bin.new(filename):getRandomHash(16) - if struct.handle then - FID=struct.handle:getRandomHash(16) - end - if not net.aft.transfers[cid] then - net.aft.transfers[cid]={} -- setup server-client filestream - end - net.aft.transfers[cid][FID]={} - net.aft.transfers[cid][FID].name=struct.filename - if struct.handle then - net.aft.transfers[cid][FID].sink=struct.handle - else - net.aft.transfers[cid][FID].sink=bin.stream(struct.filename,false) - end - net.aft.transfers[cid][FID].size=net.aft.transfers[cid][FID].sink:getSize() - net.aft.transfers[cid][FID].pieces=math.ceil(net.aft.transfers[cid][FID].size/net.aft.pieceSize) - net.aft.transfers[cid][FID].resendAlarm=multi:newAlarm(.25) - net.aft.transfers[cid][FID].resendAlarm:OnRing(function(alarm) - if not(alarm.packedDATA) then return end - self:send(ip,"!aft! TRANS "..alarm.piecenum.." "..FID.." | "..alarm.packedDATA,port) - alarm:Reset() - end) - if self.allowSmallFileCaching then - if net.aft.transfers[cid][FID].size<=1024*self.cachable then -- 10 MB or smaller can be cached - net.aft.cache[struct.filename]={} - end - end - self:send(ip,"!aft! START "..net.aft.transfers[cid][FID].pieces.." "..FID.." "..filename.." NIL",port) - else - self:send(ip,"!aft! DOWNLOAD REQUEST_REFUSED NIL NIL NIL",port) - print("ERROR 103") - end - elseif cmd=="COMPLETE" then - net.aft.transfers[cid][arg1].resendAlarm:Destroy() - net.aft.transfers[cid][arg1]=nil - end - end,"aft") -- some new stuff - end) - --Client Stuff - net.OnClientCreated:connect(function(c) - c.OnPieceRecieved=multi:newConnection() - c.OnTransferStarted=multi:newConnection() - c.OnTransferCompleted=multi:newConnection() - c.OnFileRequestFailed=multi:newConnection() -- create an aft event - c.OnFileUploadFailed=multi:newConnection() -- not yet must ensure oneway works well first - c.OnDataRecieved(function(self,data) -- when the client recieves data this method is triggered - local cmd,pieces,FID,arg1,arg2=data:match("!aft! (%S+) (%S+) (%S+) (%S+) (%S+)") - --print(cmd,pieces,FID,arg1,arg2) - if cmd=="START" then-- FID filename #pieces - local struct={ - FID=FID, - filename=arg1, - numpieces=tonumber(pieces) - } - self.OnTransferStarted:Fire(self,struct) - local fid,filename,np=struct.FID,struct.filename,struct.numpieces - local sink="" - if type(net.aft.sinks[filename])=="table" then - sink=net.aft.sinks[filename] - sink.file=filename - else - if net.aft.sinks[filename] then - bin.new():tofile(net.aft.sinks[filename]) - sink=bin.stream(net.aft.sinks[filename],false) - else - bin.new():tofile(filename) - sink=bin.stream(filename,false) - end - end - net.aft.transfers[FID]={} - net.aft.transfers[FID].name=sink.file - net.aft.transfers[FID].sink=sink - net.aft.transfers[FID].currentPiece=1 - net.aft.transfers[FID].piecesRecieved=0 - net.aft.transfers[FID].numpieces=tonumber(pieces) - c:requestPiece(FID,1) - elseif cmd=="DONE" then - local FID=pieces - print(net.aft.transfers.UPLOADS[FID].name.." has Finished Uploading!") - self.OnTransferCompleted:Fire(self,net.aft.transfers[FID].name,"U") - net.aft.transfers[FID]=nil -- clean up - elseif cmd=="PIECE" then -- Server is asking for a piece to some file - local pieces=tonumber(pieces) - local pp=pieces-1 - local unpackedDATA=net.aft.transfers.UPLOADS[FID].sink:sub((pp*net.aft.pieceSize)+1,(pp+1)*net.aft.pieceSize) - local num=#unpackedDATA - if num<384 then - self:send("!aft! TRANS "..FID.."|"..pieces.." "..net.normalize(unpackedDATA)) - else - local unpackedDATA1=unpackedDATA:sub(1,384) - local unpackedDATA2=unpackedDATA:sub(385) - local packedDATA=net.normalize(unpackedDATA1)..net.normalize(unpackedDATA2) - self:send("!aft! TRANS "..FID.."|"..pieces.." "..packedDATA) - end - elseif cmd=="TRANS" then-- self,data,FID,piecenum,hash - if self.autoNormalization==false then -- if we already handled normalization in the main data packet then don't redo - local ddata - if #arg2<512 then - ddata=net.denormalize(arg2) - else - ddata=net.denormalize(arg2:sub(1,512))..net.denormalize(arg2:sub(513)) - end - struct={ - data=ddata, - FID=FID, - piecenum=tonumber(pieces), - numpieces=net.aft.transfers[FID].numpieces, - hash=arg1, - name=net.aft.transfers[FID].name, - } - else - struct={ - data=arg2, - FID=FID, - piecenum=tonumber(pieces), - numpieces=net.aft.transfers[FID].numpieces, - hash=arg1, - name=net.aft.transfers[FID].name, - } - end - net.aft.transfers[FID].currentPiece=tonumber(pieces) - self.OnPieceRecieved:Fire(self,struct) - local data,FID,piecenum,hash=struct.data,struct.FID,struct.piecenum,struct.hash - net.aft.transfers[FID].sink:tackE(data) - net.aft.transfers[FID].piecesRecieved=net.aft.transfers[FID].piecesRecieved+1 - if net.aft.transfers[FID].numpieces==net.aft.transfers[FID].piecesRecieved then - print(net.aft.transfers[FID].name.." has finished downloading!") - net.aft.transfers[FID].sink:close() - self:send("!aft! COMPLETE "..FID.." NIL") -- for clean up purposes - self.OnTransferCompleted:Fire(self,net.aft.transfers[FID].name) - else - self:requestPiece(FID,piecenum+1) -- get next piece - end - elseif cmd=="DOWNLOAD" then - local msg=FID - self.OnFileRequestFailed:Fire(msg) - print("Download Error!",msg) - elseif cmd=="UPLOAD" then - local msg=FID - self.OnFileUploadFailed:Fire(msg) - print("Upload Error!",msg) - end - end,"aft") - function c:requestFile(filename,sink) -- sinks data through a bin-stream sink if the filename you want otherwise the filename is used instead - self:send("!aft! REQUEST "..filename.." NIL") - if sink then - net.aft.sinks[filename]=sink - end - end - function c:requestUpload(filename) - if io.fileExists(filename) then - local FID=bin.new(filename):getRandomHash(16) -- We need this, but its not as important for client as it is for servers - local file=bin.stream(filename) - if not net.aft.transfers.UPLOADS then - net.aft.transfers.UPLOADS={} - end - if not net.aft.transfers.UPLOADS[FID] then - net.aft.transfers.UPLOADS[FID]={} - end - net.aft.transfers.UPLOADS[FID].sink=file -- client file management is much simpler since we only have to worry about 1 reciever/sender - net.aft.transfers.UPLOADS[FID].name=filename - net.aft.transfers.UPLOADS[FID].size=file:getSize() - net.aft.transfers.UPLOADS[FID].pieces=math.ceil(net.aft.transfers.UPLOADS[FID].size/net.aft.pieceSize) - self:send("!aft! UPLOAD "..FID.."|"..filename.." "..net.aft.transfers.UPLOADS[FID].pieces)-- Lets send the FID we will be using and the number of pieces the server should look out for - else - self.OnFileUploadFailed:Fire("File specified not found! "..filename.." does not exist!") - end - end - function c:requestPiece(FID,piecenum) - self:send("!aft! PIECE "..FID.." "..piecenum) - end - end) -end -if net.autoInit then - net.aft.init() -end diff --git a/examples/love2d Threading Example/core/net/audp.lua b/examples/love2d Threading Example/core/net/audp.lua deleted file mode 100644 index d310477..0000000 --- a/examples/love2d Threading Example/core/net/audp.lua +++ /dev/null @@ -1,273 +0,0 @@ -function net:newAUDPServer(port,servercode) - local c={} - c.udp=assert(socket.udp()) - c.udp:settimeout(0) - c.udp:setsockname("*", port) - c.ips={} - c.Type="udp" - c.port=port - c.ids={} - c.servercode=servercode - c.bannedIPs={} - c.bannedCIDs={} - c.autoNormalization=false - function c:setUpdateRate(n) - print("Not needed in a audp server!") - end - function c:banCID(cid) - table.insert(self.bannedCIDs,cid) - end - function c:banIP(ip) - table.insert(self.bannedIPs,cid) - end - function c:send(ip,data,port,cid) - if self.autoNormalization then - data=net.normalize(data) - end - if self.servercode then - cid=cid or self:CIDFrom(ip,port) - if not self.ips[cid] then - print("Can't determine cid from client... sending the client a new one!") - local cid=net.resolveID(self) - print("Sending unique cid to client: "..cid) - self.ips[cid]={ip,port,0,self.servercode==nil} - print(ip) - self.udp:sendto("I!"..cid,ip,port) - if self.servercode then - self.udp:sendto("S!",ip,port) - end - return - end - if net.inList(self.bannedIPs,ip) or net.inList(self.bannedCIDs,cid) then - self.udp:sendto("BANNED CLIENT", ip, port or self.port) - elseif self.ips[cid][4] then - self.udp:sendto(data, ip, port or self.port) - elseif self.ips[cid][4]==false then - self.udp:sendto("Make sure your server code is correct!", ip, port) - end - else - self.udp:sendto(data, ip, port or self.port) - end - end - function c:pollClientModules(ip,port) - self:send(ip,"L!",port) - end - function c:CIDFrom(ip,port) - for i,v in pairs(self.ips) do - if(ip==v[1] and v[2]==port) then - return i - end - end - end - function c:sendAll(data) - for i,v in pairs(self.ips) do - self:send(v[1],data,v[2],i) - end - end - function c:sendAllBut(data,cid) - for i,v in pairs(self.ips) do - if i~=cid then - self:send(v[1],data,v[2],i) - end - end - end - function c:clientRegistered(cid) - return self.ips[cid] - end - function c:clientLoggedIn(cid) - if not self.clientRegistered(cid) then - return nil - end - return self.ips[cid][4] - end - function c:update() - local data,ip,port=self.udp:receivefrom() - if net.inList(self.bannedIPs,ip) or net.inList(self.bannedCIDs,cid) then - print("We will ingore data from a banned client!") - return - end - if data then - if self.autoNormalization then - data=net.denormalize(data) - end - if data:sub(1,4)=="pong" then - self.ips[data:sub(5,-1)][3]=os.clock() - elseif data:sub(1,2)=="S!" then - local cid=self:CIDFrom(ip,port) - if data:sub(3,-1)==self.servercode then - print("Servercode Accepted: "..self.servercode) - if self.ips[cid] then - self.ips[cid][4]=true - else - print("Server can't keep up! CID: "..cid.." has been skipped! Sending new CID to the client!") - local cid=net.resolveID(self) - print("Sending unique cid to client: "..cid) - self.ips[cid]={ip,port,0,self.servercode==nil} - print(ip) - self.udp:sendto("I!"..cid,ip,port) - if self.servercode then - self.udp:sendto("S!",ip,port) - end - end - else - self.udp:sendto("Make sure your server code is correct!", ip, port) - end - elseif data:sub(1,2)=="C!" then - local hook=(data:sub(11,-1)):match("!(.-)!") - self.OnDataRecieved:getConnection(hook):Fire(self,data:sub(11,-1),data:sub(3,10),ip,port) - elseif data:sub(1,2)=="E!" then - self.ips[data:sub(3,10)]=nil - obj.ids[data:sub(3,10)]=false - self.OnClientClosed:Fire(self,"Client Closed Connection!",data:sub(3,10),ip,port) - elseif data=="I!" then - local cid=net.resolveID(self) - print("Sending unique cid to client: "..cid) - self.ips[cid]={ip,port,os.clock(),self.servercode==nil} - print(ip) - self.udp:sendto("I!"..cid,ip,port) - if self.servercode then - self.udp:sendto("S!",ip,port) - end - self.OnClientConnected:Fire(self,cid,ip,port) - elseif data:sub(1,2)=="L!" then - cid,cList=data:sub(3,10),data:sub(11,-1) - local list={} - for m,v in cList:gmatch("(%S-):(%S-)|") do - list[m]=v - end - self.OnClientsModulesList:Fire(list,cid,ip,port) - end - end - for cid,dat in pairs(self.ips) do - if not((os.clock()-dat[3])<65) then - self.ips[cid]=nil - self.OnClientClosed:Fire(self,"Client lost Connection: ping timeout",cid,ip,port) - end - end - end - c.OnClientsModulesList=multi:newConnection() - c.OnDataRecieved=multi:newConnection() - c.OnClientClosed=multi:newConnection() - c.OnClientConnected=multi:newConnection() - c.connectiontest=multi:newAlarm(30) - c.connectiontest.link=c - c.connectiontest:OnRing(function(alarm) - --print("pinging clients!") - alarm.link:sendAll("ping") - alarm:Reset() - end) - multi:newLoop(function() - c:update() - end) - net.OnServerCreated:Fire(c) - return c -end - -function net:newAUDPClient(host,port,servercode,nonluaServer) - local c={} - c.ip=assert(socket.dns.toip(host)) - c.udp=assert(socket.udp()) - c.udp:settimeout(0) - c.cid="NIL" - c.lastPing=0 - c.Type="udp" - c.servercode=servercode - c.autoReconnect=true - c.autoNormalization=false - function c:pollPing(n) - return not((os.clock()-self.lastPing)<(n or 60)) - end - function c:send(data) - if self.autoNormalization then - data=net.normalize(data) - end - self.udp:send("C!"..self.cid..data) - end - function c:sendRaw(data) - if self.autoNormalization then - data=net.normalize(data) - end - self.udp:send(data) - end - function c:getCID() - if self:IDAssigned() then - return self.cid - end - end - function c:close() - self:send("E!") - end - function c:IDAssigned() - return self.cid~="NIL" - end - function c:update() - local data=self.udp:receive() - if data then - if self.autoNormalization then - data=net.denormalize(data) - end - if data:sub(1,2)=="I!" then - self.cid=data:sub(3,-1) - self.OnClientReady:Fire(self) - elseif data=="S!" then - self.udp:send("S!"..(self.servercode or "")) - elseif data=="L!" then - local mods="" - local m="" - for i=1,#net.loadedModules do - m=net.loadedModules[i] - mods=mods..m..":"..net.getModuleVersion(m).."|" - end - self.udp:send("L!"..self.cid..mods) - elseif data=="ping" then - self.lastPing=os.clock() - self.OnPingRecieved:Fire(self) - self.udp:send("pong"..self.cid) - else - local hook=data:match("!(.-)!") - self.OnDataRecieved:getConnection(hook):Fire(self,data) - end - end - end - function c:reconnect() - if not nonluaServer then - self.cid="NIL" - c.udp:send("I!") - end - self.OnConnectionRegained:Fire(self) - end - c.pingEvent=multi:newEvent(function(self) return self.link:pollPing() end) - c.pingEvent:OnEvent(function(self) - if self.link.autoReconnect then - self.link.OnServerNotAvailable:Fire("Connection to server lost: ping timeout! Attempting to reconnect...") - self.link.OnClientDisconnected:Fire(self,"closed") - self.link:reconnect() - else - self.link.OnServerNotAvailable:Fire("Connection to server lost: ping timeout!") - self.link.OnClientDisconnected:Fire(self,"closed") - end - end) - c.pingEvent.link=c - c.OnPingRecieved=multi:newConnection() - c.OnDataRecieved=multi:newConnection() - c.OnServerNotAvailable=multi:newConnection() - c.OnClientReady=multi:newConnection() - c.OnClientDisconnected=multi:newConnection() - c.OnConnectionRegained=multi:newConnection() - c.notConnected=multi:newFunction(function(self) - self:hold(3) - if self.link:IDAssigned()==false then - self.link.OnServerNotAvailable:Fire("Can't connect to the server: no response from server") - end - end) - c.notConnected.link=c - if not nonluaServer then - c.udp:send("I!") - end - multi:newLoop(function() - c:update() - end) - multi:newJob(function() c.notConnected() end) - net.OnClientCreated:Fire(c) - return c -end diff --git a/examples/love2d Threading Example/core/net/chatting.lua b/examples/love2d Threading Example/core/net/chatting.lua deleted file mode 100644 index b2ab8d5..0000000 --- a/examples/love2d Threading Example/core/net/chatting.lua +++ /dev/null @@ -1,134 +0,0 @@ -require("net") -require("net.identity") ---General Stuff ---[[ What this module does! -Adds -net.chatting:init() -server:OnChatRecieved(function({user,msg}) end) -client:OnChatRecieved(function(user,msg) end) -client:sendChat(user,msg) -]] -net:registerModule("chatting",{3,0,0}) -net.chatting.users={} -function net.chatting:getUserIdFromIP(ip) - return net.chatting.users[ip] -end -function net.chatting:init() -- calling this initilizes the library and binds it to the servers and clients created - --Server Stuff - net.OnServerCreated:connect(function(s) - print("The Chatting Module has been loaded onto the server!") - s.OnUserLoggedIn(function(user,cid,ip,port,dTable) - dTable=loadstring("return "..dTable)() - local USERID=bin.new(user):getHash(32) - net.chatting.users[USERID]={dTable.nick,cid,ip,port,dTable} -- add users that log in to the userlist - net.chatting.users[ip]=USERID -- add users that log in to the userlist - local users={} - for i,v in pairs(net.chatting.users) do - if type(i)~="userdata" then - table.insert(users,i.."|"..net.chatting.users[i][1]) - end - end - table.insert(users,"") - for i,v in pairs(s.ips) do - s:send(v,"!chatting! $Users|NIL|NIL '"..table.concat(users,",").."'") - end - end) - s.OnUserLoggerOut(function(self,user) - local USERID=bin.new(user):getHash(32) - local ip=net.chatting.users[USERID] - print(USERID) - net.chatting.users[USERID]=nil - net.chatting.users[ip]=nil - end) - s.OnDataRecieved(function(self,data,cid,ip,port) -- when the server recieves data this method is triggered - --First Lets make sure we are getting chatting data - local user,msg = data:match("!chatting! (%S-) (.+)") - if user and msg then - if user:sub(1,1)=="$" then - local cmd,arg=user:match("$(.+)|(.+)") - print("Using extended chatting protocal!") - if cmd=="DM" then - local struct={ -- pack the info up as a table so the server can do filtering and whatnot to the chat - user=user, - msg=net.denormalize(msg) - } - self.OnChatRecieved:Fire(struct,"PRIVATE") - print("USERID",arg) - self:send(net.chatting.users[arg][3],"!chatting! $DM|"..net.chatting.users[arg][1].."|"..net.chatting:getUserIdFromIP(ip).." "..net.normalize(struct.msg).."",net.chatting.users[arg][4]) - elseif cmd=="getUsers" then - local users={} - for i,v in pairs(net.chatting.users) do - if type(i)~="userdata" then - table.insert(users,i.."|"..net.chatting.users[i][1]) - end - end - table.insert(users,"") - self:send(ip,"!chatting! $Users|NIL|NIL "..table.concat(users,",").."",port) - end - else - local struct={ -- pack the info up as a table so the server can do filtering and whatnot to the chat - user=user, - msg=net.denormalize(msg) - } - self.OnChatRecieved:Fire(struct,"GROUP") -- trigger the chat event - local USERID=net.chatting:getUserIdFromIP(ip) - for i,v in pairs(self.ips) do - if ip==v then - self:send(v,"!chatting! 1|"..struct.user.."|"..USERID.." "..net.normalize(struct.msg).."") - else - self:send(v,"!chatting! 0|"..struct.user.."|"..USERID.." "..net.normalize(struct.msg).."") - end - end - end - end - end,"chatting") - s.rooms={} - function s:regesterRoom(roomname) - self.rooms[roomname]={} - end - s.OnChatRecieved=multi:newConnection() -- create a chat event - end) - --Client Stuff - net.OnClientCreated:connect(function(c) - c.OnDataRecieved(function(self,data) -- when the client recieves data this method is triggered - --First Lets make sure we are getting chatting data - local isself,user,USERID,msg = data:match("!chatting! (%S-)|(%S-)|(%S-) (.+)") - if not isself then return end - if tonumber(isself) then - --This is the client so our job here is done - local msg=net.denormalize(msg) - self.OnChatRecieved:Fire(user,msg,({["1"]=true, ["0"]=false})[isself],USERID) -- trigger the chat event - elseif isself:sub(1,1)=="$" then - local cmd=isself:match("$(.+)") - if cmd=="DM" then - local msg=net.denormalize(msg) - c.OnPrivateChatRecieved:Fire(user,msg,USERID) - elseif cmd=="Users" then - local tab={} - for ID,nick in msg:gmatch("(%S-)|(%S-),") do - tab[nick]=ID - end - c.OnUserList:Fire(tab) - end - end - end,"chatting") - function c:sendChat(user,msg) - self:send("!chatting! "..user.." "..net.normalize(msg).."") - end - function c:sendChatTo(user,touser,msg) - self:send("!chatting! $DM|"..touser.." "..net.normalize(msg).."") - end - function c:getUserList() - self:send("!chatting! $getUsers|NIL NIL") - end - function c:getChatFrom(userID) - self:send("!chatting! getPrivateChat|NIL "..userID) -- add if time permits - end - c.OnPrivateChatRecieved=multi:newConnection() - c.OnUserList=multi:newConnection() - c.OnChatRecieved=multi:newConnection() -- create a chat event - end) -end -if net.autoInit then - net.chatting:init() -end diff --git a/examples/love2d Threading Example/core/net/db.lua b/examples/love2d Threading Example/core/net/db.lua deleted file mode 100644 index 6e2c41e..0000000 --- a/examples/love2d Threading Example/core/net/db.lua +++ /dev/null @@ -1,15 +0,0 @@ -require("parseManager") -require("net.identity") -- serversie module -net:registerModule("db",{1,0,0}) -net.OnServerCreated:connect(function(s) - s.OnUserLoggedIn(function(user,cid,ip,port,dTable) -- dealing with userdata - -- - end) - function s:createTable(PKey,fmt,path) - -- - end -end) ---keys are case insensitive, hex and regular base 10 numbers are allowed as well as other structures ---We define a table below with keys and their max size - - diff --git a/examples/love2d Threading Example/core/net/eft.lua b/examples/love2d Threading Example/core/net/eft.lua deleted file mode 100644 index c88e472..0000000 --- a/examples/love2d Threading Example/core/net/eft.lua +++ /dev/null @@ -1,24 +0,0 @@ -require("net") -net:registerModule("eft",{1,0,0}) ---[[ - This module provides a dedicated socket for file transfer - This allows us to do some more complex stuff with it - The only data that is non file stuff is the initial handshake - CMDs are done on the general socket while transfers are done on the file socket -]] -net.OnServerCreated:connect(function(s) - print("The eft(Expert File Transfer) Module has been loaded onto the server!") - if s.Type~="tcp" then - print("It is recomended that you use tcp to transfer files!") - end - s.OnDataRecieved(function(self,data,CID_OR_HANDLE,IP_OR_HANDLE,PORT_OR_IP) - -- - end,"eft") - -- -end) -net.OnClientCreated:connect(function(c) - c.OnDataRecieved(function(self,data) - -- - end,"eft") - -- -end) diff --git a/examples/love2d Threading Example/core/net/email.lua b/examples/love2d Threading Example/core/net/email.lua deleted file mode 100644 index 1f46368..0000000 --- a/examples/love2d Threading Example/core/net/email.lua +++ /dev/null @@ -1,54 +0,0 @@ -require("net.identity") -net:registerModule("email",{1,0,0}) --- needs rewriting, where it uses the identity module and can send an email. EX: server:email(user,subject,body) -smtp = require 'socket.smtp' -ssl = require 'ssl' -- server side only so noworries for love2d users - -function net.email.init(from,user,pass) - net.OnServerCreated:connect(function(s) - s.from=from - s.user=user - s.pass=pass - function s:sendMessage(subject, body, dTable) - local msg = { - headers = { - from = '<'..dTable.email..'>' - to = dTable.nick..' <'..dTable.email..'>', - subject = subject - }, - body = body - } - local ok, err = smtp.send { - from = '<'..self.from..'>', - rcpt = '<'..dTable.email..'>', - source = smtp.message(msg), - user = self.user, - password = self.pass, - server = 'smtp.gmail.com', - port = 465, - create = net.sslCreate - } - if not ok then - print("Mail send failed", err) -- better error handling required - end - end - end) -end -function net.sslCreate() - local sock = socket.tcp() - return setmetatable({ - connect = function(_, host, port) - local r, e = sock:connect(host, port) - if not r then return r, e end - sock = ssl.wrap(sock, {mode='client', protocol='tlsv1'}) - return sock:dohandshake() - end - }, { - __index = function(t,n) - return function(_, ...) - return sock[n](sock, ...) - end - end - }) -end - diff --git a/examples/love2d Threading Example/core/net/emailWIP.lua b/examples/love2d Threading Example/core/net/emailWIP.lua deleted file mode 100644 index dbea43a..0000000 --- a/examples/love2d Threading Example/core/net/emailWIP.lua +++ /dev/null @@ -1,53 +0,0 @@ -require("net.identity") -net:registerModule("email",{1,0,0}) -smtp = require 'socket.smtp' -ssl = require 'ssl' - -function net.email.init(from,user,pass) - net.OnServerCreated:connect(function(s) - s.from=from - s.user=user - s.pass=pass - function s:sendMessage(subject, body, dTable) - local msg = { - headers = { - from = '<'..dTable.email..'>' - to = dTable.nick..' <'..dTable.email..'>', - subject = subject - }, - body = body - } - local ok, err = smtp.send { - from = '<'..self.from..'>', - rcpt = '<'..dTable.email..'>', - source = smtp.message(msg), - user = self.user, - password = self.pass, - server = 'smtp.gmail.com', - port = 465, - create = net.sslCreate - } - if not ok then - print("Mail send failed", err) -- better error handling required - end - end - end) -end -function net.sslCreate() - local sock = socket.tcp() - return setmetatable({ - connect = function(_, host, port) - local r, e = sock:connect(host, port) - if not r then return r, e end - sock = ssl.wrap(sock, {mode='client', protocol='tlsv1'}) - return sock:dohandshake() - end - }, { - __index = function(t,n) - return function(_, ...) - return sock[n](sock, ...) - end - end - }) -end - diff --git a/examples/love2d Threading Example/core/net/identity.lua b/examples/love2d Threading Example/core/net/identity.lua deleted file mode 100644 index c16aa43..0000000 --- a/examples/love2d Threading Example/core/net/identity.lua +++ /dev/null @@ -1,266 +0,0 @@ -require("net") ---General Stuff ---[[ What this module does! -Adds -net.identity:init() - -]] -net:registerModule("identity",{2,1,0})--1.0.1 Note: Added eaiser ways to get user data using only cid -function net.hash(text,n) - n=n or 16 - return bin.new(text.."jgmhktyf"):getHash(n) -end -net.identity.UIDS={} -net.identity.UIDS.ids={} -function net.identity:init() -- calling this initilizes the library and binds it to the servers and clients created - --Server Stuff - net.OnServerCreated(function(s) - s.userFolder="./USERS" - print("The identity Module has been loaded onto the server!") - function s:_isRegistered(user) - return io.fileExists(self.userFolder..net.hash(user)..".dat") - end - function s:getUserData(user) - local userdata=bin.load(self.userFolder..net.hash(user)..".dat") - local nick,dTable=userdata:match("%S-|%S-|(%S-)|(.+)") - return nick,loadstring("return "..(dTable or "{}"))() - end - function s:modifyUserData(user,oldpass,pass,nick,dTable) - if self:_isRegistered(user) then - local userdata=bin.load(self.userFolder..net.hash(user)..".dat") - local args={} - local _pass,_nick,_dTable=userdata:match("%S-|(%S-)|(%S-)|(.+)") - if oldpass~=_pass then - args.invalidPass=true - pass=_pass - end - if not nick then nick=_nick args.invalidNick=true end - table.merge(_dTable or {}, dTable or {}) - bin.new(string.format("%s|%s|%s|%s\n",user,pass,nick,dTable)):tofile(self.userFolder..net.hash(user)..".dat") - else - return false - end - end - function s:getUserCred(user) - local userdata=bin.load(self.userFolder..net.hash(user)..".dat") - return userdata:match("%S-|(%S-)|") - end - function s:getUSERID(cid) - return (net.identity.UIDS[cid] or "User Not Logged In!") - end - function s:getUsername(cid) - return self:userLoggedIn(cid) - end - function s:getNickname(cid) - return self.loggedIn[self:getUsername(cid)].nick - end - function s:getdTable(cid) - return self.loggedIn[self:getUsername(cid)] - end - function s:getUserDat(cid) - return self:getUserDataHandle(self:getUsername(cid)) - end - function s:getNickFromUSERID(USERID) - return bin.load(self.userFolder..net.hash(user)..".dat"):match("%S-|%S-|(%S-)|") - end - function s:userLoggedIn(cid) - for i,v in pairs(self.loggedIn) do - if v.cid==cid then - return i - end - end - return false - end - function s:setDataLocation(loc) - if not io.dirExists(loc) then - io.mkDir(loc) - end - self.userFolder=loc - end - s:setDataLocation("USERS/") - function s:logoutUser(user) - net.identity.UIDS.ids[user.UID]=nil - self.loggedIn[user]=nil - end - function s:loginUser(user,cid) - net.identity.UIDS[cid]=net.hash(user) - local nick,dTable=self:getUserData(user) - self.loggedIn[user]={} - table.merge(self.loggedIn[user],dTable or {}) - self.loggedIn[user].cid=cid - self.loggedIn[user].nick=nick - self.loggedIn[user].UID=net.resolveID(net.identity.UIDS) - return self.loggedIn[user] - end - function s:getUserDataHandle(user) - return self.loggedIn[user] - end - function s:syncUserData(user,ip,port) - local handle=self:getUserDataHandle(user) - self:send(ip,"!identity! SYNC <-|"..bin.ToStr(handle).."|->",port) - end - s.loggedIn={} - s.allowDuplicateNicks=true - s.minimumNickLength=4 - s.minimumUserLength=4 - s.OnUserRegistered=multi:newConnection() - s.OnUserLoggedIn=multi:newConnection() - s.OnUserLoggerOut=multi:newConnection() - s.OnAlreadyLoggedIn=multi:newConnection() - s.OnPasswordForgotten=multi:newConnection() - s.OnDataRecieved:connect(function(self,data,cid,ip,port) -- when the server recieves data this method is triggered - local cmd,arg1,arg2,arg3,arg4 = data:match("!identity! (%S-) '(.-)' '(.-)' '(.-)' <%-|(.+)|%->") - if cmd=="register" then - local user,pass,nick,dTable = arg1,arg2,arg3,arg4 - if self:_isRegistered(user) then - self:send(ip,"!identity! REGISTERED <-|"..user.."|->",port) - else - if not(self.userFolder:sub(-1,-1)=="/" or self.userFolder:sub(-1,-1)=="\\") then - self.userFolder=self.userFolder.."/" - end - local rets=self.OnUserRegistered:Fire(user,pass,nick,loadstring("return "..(dTable or "{}"))()) - if #user<=self.minimumUserLength then - self:send(ip,"!identity! REGISTERREFUSED <-|Username too short|->",port) - return - end - if #user<=self.minimumNickLength then - self:send(ip,"!identity! REGISTERREFUSED <-|Nickname too short|->",port) - return - end - for i=1,#rets do - if rets[i][1]==false then - print("Server refused to accept registration request!") - self:send(ip,"!identity! REGISTERREFUSED <-|Unspecified Error|->",port) - return - end - end - multi:newFunction(function(func) -- anom func, allows for fancy multitasking - local dupnickfilemanager=bin.stream(self.userFolder.."Nicks.dat",false) - local isValid=func:newCondition(function() return t~=nil end) - local tab={} - local t=dupnickfilemanager:getBlock("s") - if self.allowDuplicateNicks==false then - while func:condition(isValid) do - tab[#tab]=t - if t==nick then - self:send(ip,"!identity! REGISTERREFUSED <-|Duplicate Nicks are not allowed|->",port) - dupnickfilemanager:close() - return - end - end - t=dupnickfilemanager:getBlock("s") - end - dupnickfilemanager:addBlock(nick.."|"..bin.new(user):getHash(32)) - dupnickfilemanager:close() - bin.new(string.format("%s|%s|%s|%s\n",user,pass,nick,dTable)):tofile(self.userFolder..net.hash(user)..".dat") - self:send(ip,"!identity! REGISTEREDGOOD <-|"..user.."|->",port) - func=nil -- we dont want 1000s+ of these anom functions lying around - return - end)()-- lets call the function - end - return - elseif cmd=="login" then - local user,pass = arg1,arg2 - local _pass=s:getUserCred(user) - if not(self:_isRegistered(user)) then - self:send(ip,"!identity! LOGINBAD <-|nil|->",port) - return - end - if pass==_pass then - if self:userLoggedIn(cid) then - self.OnAlreadyLoggedIn:Fire(self,user,cid,ip,port) - self:send(ip,"!identity! ALREADYLOGGEDIN <-|nil|->",port) - return - end - local handle=self:loginUser(user,cid) -- binds the cid to username - self:send(ip,"!identity! LOGINGOOD <-|"..bin.ToStr(handle).."|->",port) - self.OnUserLoggedIn:Fire(user,cid,ip,port,bin.ToStr(handle)) - return - else - self:send(ip,"!identity! LOGINBAD <-|nil|->",port) - return - end - elseif cmd=="logout" then - self:logoutUser(user) - self.OnClientClosed:Fire(self,"User logged out!",cid,ip,port) - elseif cmd=="sync" then - local dTable = loadstring("return "..(arg4 or "{}"))() - local handle = self:getUserDataHandle(self:userLoggedIn(cid)) - table.merge(handle,dTable) - elseif cmd=="pass" then - local user=arg1 - if self:_isRegistered(user) then - self.OnPasswordForgotten:Fire(arg1,cid) - self:send(ip,"!identity! PASSREQUESTHANDLED <-|NONE|->",port) - else - self:send(ip,"!identity! NOUSER <-|"..user.."|->",port) - end - end - end) - s.OnClientClosed:connect(function(self,reason,cid,ip,port) - self.OnUserLoggerOut:Fire(self,self:userLoggedIn(cid),cid,reason) - end) - end,"identity") - --Client Stuff - net.OnClientCreated:connect(function(c) - c.userdata={} - c.OnUserLoggedIn=multi:newConnection() - c.OnBadLogin=multi:newConnection() - c.OnUserAlreadyRegistered=multi:newConnection() - c.OnUserAlreadyLoggedIn=multi:newConnection() - c.OnUserRegistered=multi:newConnection() - c.OnNoUserWithName=multi:newConnection() - c.OnPasswordRequest=multi:newConnection() - c.OnUserRegisterRefused=multi:newConnection() - function c:logout() - self:send("!identity! logout 'NONE' 'NONE' 'NONE' <-|nil|->") - end - c.OnDataRecieved(function(self,data) -- when the client recieves data this method is triggered - local cmd,arg1 = data:match("!identity! (%S-) <%-|(.+)|%->") - if cmd=="REGISTERED" then - self.OnUserAlreadyRegistered:Fire(self,arg1) - elseif cmd=="REGISTEREDGOOD" then - self.OnUserRegistered:Fire(self,arg1) - elseif cmd=="REGISTERREFUSED" then - self.OnUserRegisterRefused:Fire(self,arg1) - elseif cmd=="ALREADYLOGGEDIN" then - self.OnUserAlreadyLoggedIn:Fire(self,arg1) - elseif cmd=="LOGINBAD" then - self.OnBadLogin:Fire(self) - elseif cmd=="LOGINGOOD" then - local dTable=loadstring("return "..(arg1 or "{}"))() - table.merge(self.userdata,dTable) - self.OnUserLoggedIn:Fire(self,self.userdata) - elseif cmd=="SYNC" then - local dTable=loadstring("return "..(arg1 or "{}"))() - table.merge(self.userdata,dTable) - elseif cmd=="NOUSER" then - self.OnNoUserWithName:Fire(self,arg1) - elseif cmd=="PASSREQUESTHANDLED" then - self.OnPasswordRequest:Fire(self) - end - end,"identity") - function c:syncUserData() - self:send(string.format("!identity! sync 'NONE' 'NONE' 'NONE' <-|%s|->",bin.ToStr(dTable))) - end - function c:forgotPass(user) - self:send(string.format("!identity! pass '%s' 'NONE' 'NONE' <-|nil|->",user)) - end - function c:getUserDataHandle() - return self.userdata - end - function c:logIn(user,pass) - self:send(string.format("!identity! login '%s' '%s' 'NONE' <-|nil|->",user,net.hash(pass))) - end - function c:register(user,pass,nick,dTable) - if dTable then - self:send(string.format("!identity! register '%s' '%s' '%s' <-|%s|->",user,net.hash(pass),nick,bin.ToStr(dTable))) - else - self:send(string.format("!identity! register '%s' '%s' '%s' <-|nil|->",user,net.hash(pass),nick)) - end - end - end) -end -if net.autoInit then - net.identity:init() -end diff --git a/examples/love2d Threading Example/core/net/inbox.lua b/examples/love2d Threading Example/core/net/inbox.lua deleted file mode 100644 index d76f37c..0000000 --- a/examples/love2d Threading Example/core/net/inbox.lua +++ /dev/null @@ -1,70 +0,0 @@ -require("net.identity") -require("net.aft") -require("net.users") -require("net.db") -net:registerModule("inbox",{1,0,0}) ---self.OnUserLoggedIn:Fire(user,cid,ip,port,bin.ToStr(handle)) ---allows the storing of messages that the user can recieve and view whenever. Allows user to also send messeges to users that are even offline! ---requires an account setup and nick name to be set at account creation -if not io.dirExists("INBOX") then - io.mkDir("INBOX") -end -net.inbox.dbfmt=db.format([=[ -[INBOX]{ - string MSG 0x800 -- contents of the message -} -[MAIL]{ - string NAME 0x20 -- username - string UID 0x10 -- User ID - string NICK 0x20 -- Nickname - number[3] DATE -- list of numbers - table INBO INBOX -- Inbox -} -]=]) -net.OnServerCreated:connect(function(s) - s.OnUserLoggedIn(function(user,cid,ip,port,dTable) - if not io.dirExists("INBOX/"..self:getUSERID(cid)) then -- Make sure inbox stuff is set up - io.mkDir("INBOX/"..self:getUSERID(cid)) - bin.new():tofile("info.dat") - end - end) - s.OnDataRecieved(function(self,data,CID_OR_HANDLE,IP_OR_HANDLE,PORT_OR_IP) - if self:userLoggedIn(cid) then -- If the user is logged in we do the tests - local cmd,arg1,arg2=data:match("!inbox! (%S+) (%S+) (%S+)") - if cmd=="SEND" then - -- - elseif cmd=="LIST" then - -- - elseif cmd=="OPEN" then - -- - elseif cmd=="DELETE" then - -- - elseif cmd=="CLEAR" then - -- - end - else - return - end - end,"inbox") -end) -net.OnClientCreated:connect(function(c) - c.OnDataRecieved(function(self,data) - -- - end,"inbox") - function c:sendMessage(USERID,msg) -- USERID who, msg being sent. Server handles time stamps - self:send("!inbox! SEND "..USERID.." "..msg) - end - function c:checkInbox() -- returns list of msgIDs - self:send("!inbox! LIST NIL NIL") - end - function c:checkMsg(msgId) - self:send("!inbox! OPEN "..msgId.." NIL") -- server sends back msg content as a file - end - function c:deleteMessage(msgID) - self:send("!inbox! DELETE "..msgId.." NIL") - end - function c:clearInbox() - self:send("!inbox! CLEAR NIL NIL") - end - -- -end) diff --git a/examples/love2d Threading Example/core/net/init.lua b/examples/love2d Threading Example/core/net/init.lua deleted file mode 100644 index 21f3db9..0000000 --- a/examples/love2d Threading Example/core/net/init.lua +++ /dev/null @@ -1,664 +0,0 @@ ---[[ - UPCOMMING ADDITIONS - AUDP - advance udp/ Ensures packets arrive and handles late packets. - P2P - peer to peer (Server to set up initial connection) - Relay - offput server load (locally) - Threading - Simple threading (UDP/AUDP Only) - Priority handling -]] ---[[ - TODO: Finish stuff for Priority handling -]] -function table.merge(t1, t2) - for k,v in pairs(t2) do - if type(v) == 'table' then - if type(t1[k] or false) == 'table' then - table.merge(t1[k] or {}, t2[k] or {}) - else - t1[k] = v - end - else - t1[k] = v - end - end - return t1 -end -function string.trim(s) - local from = s:match"^%s*()" - return from > #s and "" or s:match(".*%S", from) -end -socket=require("socket") -http=require("socket.http") -mime=require("mime") -net={} -net.Version={2,0,0} -- This will probably stay this version for quite a while... The modules on the otherhand will be more inconsistant -net._VERSION="2.0.0" -net.OnServerCreated=multi:newConnection() -net.OnClientCreated=multi:newConnection() -net.loadedModules={} -net.autoInit=true -function net.normalize(input) - local enc=mime.b64(input) - return enc -end -function net.denormalize(input) - local unenc=mime.unb64(input) - return unenc -end -function net.getLocalIP() - local someRandomIP = "192.168.1.122" - local someRandomPort = "3102" - local mySocket = socket.udp() - mySocket:setpeername(someRandomIP,someRandomPort) - local dat = (mySocket:getsockname()) - mySocket:close() - return dat -end -function net.getExternalIP() - local data=http.request("http://whatismyip.org/") - return data:match("600;\">(%d-.%d-.%d-.%d-)") -end -function net:registerModule(mod,version) - if net[mod] then - error("Module by the name: "..mod.." has already been registered! Remember some modules are internal and use certain names!") - end - table.insert(self.loadedModules,mod) - net[mod]={} - if version then - net[mod].Version=version - net[mod]._VERSION=version[1].."."..version[2].."."..version[3] - else - net[mod].Version={1,0,0} - net[mod]._VERSION={1,0,0} - end - return {Version=version,_VERSION=version[1].."."..version[2].."."..version[3]} -end -function net.getModuleVersion(ext) - if not ext then - return string.format("%d.%d.%d",net.Version[1],net.Version[2],net.Version[3]) - end - return string.format("%d.%d.%d",net[ext].Version[1],net[ext].Version[2],net[ext].Version[3]) -end -function net.resolveID(obj) - local num=math.random(10000000,99999999) - if obj[tostring(num)] then - return net.resolveID(obj) - end - obj.ids[tostring(num)]=true - return tostring(num) -end -function net.inList(list,dat) - for i,v in pairs(list) do - if v==dat then - return true - end - end - return false -end -function net.setTrigger(funcW,funcE) - multi:newTrigger(func) -end -net:registerModule("net",net.Version) --- Client broadcast -function net:newCastedClient(name) -- connects to the broadcasted server - local listen = socket.udp() -- make a new socket - listen:setsockname(net.getLocalIP(), 11111) - listen:settimeout(0) - local timer=multi:newTimer() - while true do - local data, ip, port = listen:receivefrom() - if timer:Get()>3 then - error("Timeout! Server by the name: "..name.." has not been found!") - end - if data then - local n,tp,ip,port=data:match("(%S-)|(%S-)|(%S-):(%d+)") - if n:match(name) then - print("Found Server!",n,tp,ip,port) - if tp=="tcp" then - return net:newTCPClient(ip,tonumber(port)) - else - return net:newClient(ip,tonumber(port)) - end - end - end - end -end --- UDP Stuff -function net:newServer(port,servercode) - local c={} - c.udp=assert(socket.udp()) - c.udp:settimeout(0) - c.udp:setsockname("*", port) - c.ips={} - c.Type="udp" - c.port=port - c.ids={} - c.servercode=servercode - c.bannedIPs={} - c.bannedCIDs={} - c.autoNormalization=false - function c:setUpdateRate(n) - print("Not needed in a udp server!") - end - function c:banCID(cid) - table.insert(self.bannedCIDs,cid) - end - function c:banIP(ip) - table.insert(self.bannedIPs,cid) - end - c.broad=socket.udp() - c.hostip=net.getLocalIP() - function c:broadcast(name) - local loop=multi:newTLoop(function(dt,loop) - self.broad:setoption('broadcast',true) - self.broad:sendto(name.."|"..self.Type.."|"..self.hostip..":"..self.port, "255.255.255.255", 11111) - self.broad:setoption('broadcast',false) - end,1) - end - function c:send(ip,data,port,cid) - if self.autoNormalization then - data=net.normalize(data) - end - if self.servercode then - cid=cid or self:CIDFrom(ip,port) - if not self.ips[cid] then - print("Can't determine cid from client... sending the client a new one!") - local cid=net.resolveID(self) - print("Sending unique cid to client: "..cid) - self.ips[cid]={ip,port,0,self.servercode==nil} - print(ip) - self.udp:sendto("I!"..cid,ip,port) - if self.servercode then - self.udp:sendto("S!",ip,port) - end - return - end - if net.inList(self.bannedIPs,ip) or net.inList(self.bannedCIDs,cid) then - self.udp:sendto("BANNED CLIENT", ip, port or self.port) - elseif self.ips[cid][4] then - self.udp:sendto(data, ip, port or self.port) - elseif self.ips[cid][4]==false then - self.udp:sendto("Make sure your server code is correct!", ip, port) - end - else - self.udp:sendto(data, ip, port or self.port) - end - end - function c:pollClientModules(ip,port) - self:send(ip,"L!",port) - end - function c:CIDFrom(ip,port) - for i,v in pairs(self.ips) do - if(ip==v[1] and v[2]==port) then - return i - end - end - end - function c:sendAll(data) - for i,v in pairs(self.ips) do - self:send(v[1],data,v[2],i) - end - end - function c:sendAllBut(data,cid) - for i,v in pairs(self.ips) do - if i~=cid then - self:send(v[1],data,v[2],i) - end - end - end - function c:clientRegistered(cid) - return self.ips[cid] - end - function c:clientLoggedIn(cid) - if not self.clientRegistered(cid) then - return nil - end - return self.ips[cid][4] - end - function c:update() - local data,ip,port=self.udp:receivefrom() - if net.inList(self.bannedIPs,ip) or net.inList(self.bannedCIDs,cid) then - print("We will ingore data from a banned client!") - return - end - if data then - if self.autoNormalization then - data=net.denormalize(data) - end - if data:sub(1,4)=="pong" then - --print("Recieved pong from: "..data:sub(5,-1)) - self.ips[data:sub(5,-1)][3]=os.clock() - elseif data:sub(1,2)=="S!" then - local cid=self:CIDFrom(ip,port) - if data:sub(3,-1)==self.servercode then - print("Servercode Accepted: "..self.servercode) - if self.ips[cid] then - self.ips[cid][4]=true - else - print("Server can't keep up! CID: "..cid.." has been skipped! Sending new CID to the client!") - local cid=net.resolveID(self) - print("Sending unique cid to client: "..cid) - self.ips[cid]={ip,port,0,self.servercode==nil} - print(ip) - self.udp:sendto("I!"..cid,ip,port) - if self.servercode then - self.udp:sendto("S!",ip,port) - end - end - else - self.udp:sendto("Make sure your server code is correct!", ip, port) - end - elseif data:sub(1,2)=="C!" then - local hook=(data:sub(11,-1)):match("!(.-)!") - self.OnDataRecieved:getConnection(hook):Fire(self,data:sub(11,-1),data:sub(3,10),ip,port) - elseif data:sub(1,2)=="E!" then - self.ips[data:sub(3,10)]=nil - obj.ids[data:sub(3,10)]=false - self.OnClientClosed:Fire(self,"Client Closed Connection!",data:sub(3,10),ip,port) - elseif data=="I!" then - local cid=net.resolveID(self) - print("Sending unique cid to client: "..cid) - self.ips[cid]={ip,port,os.clock(),self.servercode==nil} - print(ip) - self.udp:sendto("I!"..cid,ip,port) - if self.servercode then - self.udp:sendto("S!",ip,port) - end - self.OnClientConnected:Fire(self,cid,ip,port) - elseif data:sub(1,2)=="L!" then - cid,cList=data:sub(3,10),data:sub(11,-1) - local list={} - for m,v in cList:gmatch("(%S-):(%S-)|") do - list[m]=v - end - self.OnClientsModulesList:Fire(list,cid,ip,port) - end - end - for cid,dat in pairs(self.ips) do - if not((os.clock()-dat[3])<65) then - self.ips[cid]=nil - self.OnClientClosed:Fire(self,"Client lost Connection: ping timeout",cid,ip,port) - end - end - end - c.OnClientsModulesList=multi:newConnection() - c.OnDataRecieved=multi:newConnection() - c.OnClientClosed=multi:newConnection() - c.OnClientConnected=multi:newConnection() - c.connectiontest=multi:newAlarm(30) - c.connectiontest.link=c - c.connectiontest:OnRing(function(alarm) - --print("pinging clients!") - alarm.link:sendAll("ping") - alarm:Reset() - end) - multi:newLoop(function() - c:update() - end) - net.OnServerCreated:Fire(c) - return c -end - -function net:newClient(host,port,servercode,nonluaServer) - local c={} - c.ip=assert(socket.dns.toip(host)) - c.udp=assert(socket.udp()) - c.udp:settimeout(0) - c.udp:setpeername(c.ip, port) - c.cid="NIL" - c.lastPing=0 - c.Type="udp" - c.servercode=servercode - c.autoReconnect=true - c.autoNormalization=false - function c:pollPing(n) - return not((os.clock()-self.lastPing)<(n or 60)) - end - function c:send(data) - if self.autoNormalization then - data=net.normalize(data) - end - self.udp:send("C!"..self.cid..data) - end - function c:sendRaw(data) - if self.autoNormalization then - data=net.normalize(data) - end - self.udp:send(data) - end - function c:getCID() - if self:IDAssigned() then - return self.cid - end - end - function c:close() - self:send("E!") - end - function c:IDAssigned() - return self.cid~="NIL" - end - function c:update() - local data=self.udp:receive() - if data then - if self.autoNormalization then - data=net.denormalize(data) - end - if data:sub(1,2)=="I!" then - self.cid=data:sub(3,-1) - self.OnClientReady:Fire(self) - elseif data=="S!" then - self.udp:send("S!"..(self.servercode or "")) - elseif data=="L!" then - local mods="" - local m="" - for i=1,#net.loadedModules do - m=net.loadedModules[i] - mods=mods..m..":"..net.getModuleVersion(m).."|" - end - self.udp:send("L!"..self.cid..mods) - elseif data=="ping" then - self.lastPing=os.clock() - self.OnPingRecieved:Fire(self) - self.udp:send("pong"..self.cid) - else - local hook=data:match("!(.-)!") - self.OnDataRecieved:getConnection(hook):Fire(self,data) - end - end - end - function c:reconnect() - if not nonluaServer then - self.cid="NIL" - c.udp:send("I!") - end - self.OnConnectionRegained:Fire(self) - end - c.pingEvent=multi:newEvent(function(self) return self.link:pollPing() end) - c.pingEvent:OnEvent(function(self) - if self.link.autoReconnect then - self.link.OnServerNotAvailable:Fire("Connection to server lost: ping timeout! Attempting to reconnect...") - self.link.OnClientDisconnected:Fire(self,"closed") - self.link:reconnect() - else - self.link.OnServerNotAvailable:Fire("Connection to server lost: ping timeout!") - self.link.OnClientDisconnected:Fire(self,"closed") - end - end) - c.pingEvent.link=c - c.OnPingRecieved=multi:newConnection() - c.OnDataRecieved=multi:newConnection() - c.OnServerNotAvailable=multi:newConnection() - c.OnClientReady=multi:newConnection() - c.OnClientDisconnected=multi:newConnection() - c.OnConnectionRegained=multi:newConnection() - c.notConnected=multi:newFunction(function(self) - self:hold(3) - if self.link:IDAssigned()==false then - self.link.OnServerNotAvailable:Fire("Can't connect to the server: no response from server") - end - end) - c.notConnected.link=c - if not nonluaServer then - c.udp:send("I!") - end - multi:newLoop(function() - c:update() - end) - multi:newJob(function() c.notConnected() end) - net.OnClientCreated:Fire(c) - return c -end ---TCP Stuff -function net:newTCPServer(port) - local c={} - c.tcp=assert(socket.bind("*", port)) - c.tcp:settimeout(0) - c.ip,c.port=c.tcp:getsockname() - c.ips={} - c.port=port - c.ids={} - c.bannedIPs={} - c.Type="tcp" - c.rMode="*l" - c.sMode="*l" - c.updaterRate=1 - c.autoNormalization=false - c.updates={} - c.links={} - c.broad=socket.udp() - c.hostip=net.getLocalIP() - function c:broadcast(name) - local loop=multi:newTLoop(function(dt,loop) - self.broad:setoption('broadcast',true) - self.broad:sendto(name.."|"..self.Type.."|"..self.hostip..":"..self.port, "255.255.255.255", 11111) - self.broad:setoption('broadcast',false) - end,1) - end - function c:setUpdateRate(n) - self.updaterRate=n - end - function c:setReceiveMode(mode) - self.rMode=mode - end - function c:setSendMode(mode) - self.rMode=mode - end - function c:banCID(cid) - print("Function not supported on a tcp server!") - end - function c:banIP(ip) - table.insert(self.bannedIPs,cid) - end - function c:send(handle,data) - if self.autoNormalization then - data=net.normalize(data) - end - if self.sMode=="*l" then - handle:send(data.."\n") - else - handle:send(data) - end - end - function c:sendAllData(handle,data) - if self.autoNormalization then - data=net.normalize(data) - end - handle:send(data) - end - function c:pollClientModules(ip,port) - self:send(ip,"L!",port) - end - function c:CIDFrom(ip,port) - print("Method not supported when using a TCP Server!") - return "CIDs in TCP work differently!" - end - function c:sendAll(data) - for i,v in pairs(self.ips) do - self:send(v,data) - end - end - function c:sendAllBut(data,cid) - for i,v in pairs(self.ips) do - if not(cid==i) then - self:send(v,data) - end - end - end - function c:clientRegistered(cid) - return self.ips[cid] - end - function c:clientLoggedIn(cid) - return self.ips[cid] - end - function c:getUpdater(cid) - return self.updates[cid] - end - function c:update() - local client = self.tcp:accept(self.rMode) - if not client then return end - table.insert(self.ips,client) - client:settimeout(0) - --client:setoption('tcp-nodelay', true) - client:setoption('keepalive', true) - ip,port=client:getpeername() - if ip and port then - print("Got connection from: ",ip,port) - local updater=multi:newUpdater(skip) - self.updates[client]=updater - self.OnClientConnected:Fire(self,self.client,self.client,ip) - updater:OnUpdate(function(self) - local data, err = self.client:receive(self.rMode or self.Link.rMode) - if err=="closed" then - for i=1,#self.Link.ips do - if self.Link.ips[i]==self.client then - table.remove(self.Link.ips,i) - end - end - self.Link.OnClientClosed:Fire(self.Link,"Client Closed Connection!",self.client,self.client,ip) - self.Link.links[self.client]=nil -- lets clean up - self:Destroy() - end - if data then - if self.autoNormalization then - data=net.denormalize(data) - end - if net.inList(self.Link.bannedIPs,ip) then - print("We will ingore data from a banned client!") - return - end - local hook=data:match("!(.-)!") - self.Link.OnDataRecieved:getConnection(hook):Fire(self.Link,data,self.client,self.client,ip,self) - if data:sub(1,2)=="L!" then - cList=data - local list={} - for m,v in cList:gmatch("(%S-):(%S-)|") do - list[m]=v - end - self.Link.OnClientsModulesList:Fire(list,self.client,self.client,ip) - end - end - end) - updater:setSkip(self.updaterRate) - updater.client=client - updater.Link=self - function updater:setReceiveMode(mode) - self.rMode=mode - end - self.links[client]=updater - end - end - c.OnClientsModulesList=multi:newConnection() - c.OnDataRecieved=multi:newConnection() - c.OnClientClosed=multi:newConnection() - c.OnClientConnected=multi:newConnection() - multi:newLoop(function() - c:update() - end) - net.OnServerCreated:Fire(c) - return c -end -function net:newTCPClient(host,port) - local c={} - c.ip=assert(socket.dns.toip(host)) - c.port=port - c.tcp=socket.connect(c.ip,port) - if not c.tcp then - print("Can't connect to the server: no response from server") - return false - end - c.tcp:settimeout(0) - --c.tcp:setoption('tcp-nodelay', true) - c.tcp:setoption('keepalive', true) - c.Type="tcp" - c.autoReconnect=true - c.rMode="*l" - c.sMode="*l" - c.autoNormalization=false - function c:setReceiveMode(mode) - self.rMode=mode - end - function c:setSendMode(mode) - self.sMode=mode - end - function c:send(data) - if self.autoNormalization then - data=net.normalize(data) - end - if self.sMode=="*l" then - ind,err=self.tcp:send(data.."\n") - else - ind,err=self.tcp:send(data) - end - if err=="closed" then - self.OnClientDisconnected:Fire(self,err) - elseif err=="timeout" then - self.OnClientDisconnected:Fire(self,err) - elseif err then - print(err) - end - end - function c:sendRaw(data) - if self.autoNormalization then - data=net.normalize(data) - end - self.tcp:send(data) - end - function c:getCID() - return "No Cid on a tcp client!" - end - function c:close() - self.tcp:close() - end - function c:IDAssigned() - return true - end - function c:update() - if not self.tcp then return end - local data,err=self.tcp:receive() - if err=="closed" then - self.OnClientDisconnected:Fire(self,err) - elseif err=="timeout" then - self.OnClientDisconnected:Fire(self,err) - elseif err then - print(err) - end - if data then - if self.autoNormalization then - data=net.denormalize(data) - end - local hook=data:match("!(.-)!") - self.OnDataRecieved:getConnection(hook):Fire(self,data) - end - end - function c:reconnect() - multi:newFunction(function(func) - self.tcp=socket.connect(self.ip,self.port) - if self.tcp==nil then - print("Can't connect to the server: No response from server!") - func:hold(3) - self:reconnect() - return - end - self.OnConnectionRegained:Fire(self) - self.tcp:settimeout(0) - --self.tcp:setoption('tcp-nodelay', true) - self.tcp:setoption('keepalive', true) - end) - end - c.event=multi:newEvent(function(event) - return event.link:IDAssigned() - end) - c.event:OnEvent(function(event) - event.link.OnClientReady:Fire(event.link) - end) - c.event.link=c - c.OnClientReady=multi:newConnection() - c.OnClientDisconnected=multi:newConnection() - c.OnDataRecieved=multi:newConnection() - c.OnConnectionRegained=multi:newConnection() - multi:newLoop(function() - c:update() - end) - net.OnClientCreated:Fire(c) - return c -end diff --git a/examples/love2d Threading Example/core/net/logging.lua b/examples/love2d Threading Example/core/net/logging.lua deleted file mode 100644 index be82728..0000000 --- a/examples/love2d Threading Example/core/net/logging.lua +++ /dev/null @@ -1,7 +0,0 @@ -net.OnServerCreated:connect(function(s) - print("The logging Module has been loaded onto the server!") - s.OnDataRecieved:fConnect(function(self,data,cid,ip,port) - log(tostring(ip)..":"..tostring(port),"Server-log.log") - log(data,"Server-log.log") - end) -end) diff --git a/examples/love2d Threading Example/core/net/loggingWIP.lua b/examples/love2d Threading Example/core/net/loggingWIP.lua deleted file mode 100644 index be82728..0000000 --- a/examples/love2d Threading Example/core/net/loggingWIP.lua +++ /dev/null @@ -1,7 +0,0 @@ -net.OnServerCreated:connect(function(s) - print("The logging Module has been loaded onto the server!") - s.OnDataRecieved:fConnect(function(self,data,cid,ip,port) - log(tostring(ip)..":"..tostring(port),"Server-log.log") - log(data,"Server-log.log") - end) -end) diff --git a/examples/love2d Threading Example/core/net/p2p.lua b/examples/love2d Threading Example/core/net/p2p.lua deleted file mode 100644 index a1ece36..0000000 --- a/examples/love2d Threading Example/core/net/p2p.lua +++ /dev/null @@ -1,31 +0,0 @@ -net:registerModule("p2p",{1,0,0}) -net.p2p.peerdata={} ---[[ -PID(peerID)= - -]] -function net.newP2PClient(host,port) - -- -end -function net.aft:init() -- calling this initilizes the library and binds it to the servers and clients created - --Server Stuff - net.OnServerCreated:connect(function(s) - print("The aft(Advance File Transfer) Module has been loaded onto the server!") - if s.Type~="udp" then - print("As of right now p2p is only avaliable using udp!") - return "ERR_NOT_UDP" - end - s.OnDataRecieved(function(self,data,cid,ip,port) -- when the server recieves data this method is triggered - -- - end,"p2p") -- some new stuff - end) - --Client Stuff - net.OnClientCreated:connect(function(c) - c.OnDataRecieved(function(self,data) -- when the client recieves data this method is triggered - -- - end,"p2p") - end) -end -if net.autoInit then - net.aft.init() -end diff --git a/examples/love2d Threading Example/core/net/p2pWIP.lua b/examples/love2d Threading Example/core/net/p2pWIP.lua deleted file mode 100644 index a1ece36..0000000 --- a/examples/love2d Threading Example/core/net/p2pWIP.lua +++ /dev/null @@ -1,31 +0,0 @@ -net:registerModule("p2p",{1,0,0}) -net.p2p.peerdata={} ---[[ -PID(peerID)= - -]] -function net.newP2PClient(host,port) - -- -end -function net.aft:init() -- calling this initilizes the library and binds it to the servers and clients created - --Server Stuff - net.OnServerCreated:connect(function(s) - print("The aft(Advance File Transfer) Module has been loaded onto the server!") - if s.Type~="udp" then - print("As of right now p2p is only avaliable using udp!") - return "ERR_NOT_UDP" - end - s.OnDataRecieved(function(self,data,cid,ip,port) -- when the server recieves data this method is triggered - -- - end,"p2p") -- some new stuff - end) - --Client Stuff - net.OnClientCreated:connect(function(c) - c.OnDataRecieved(function(self,data) -- when the client recieves data this method is triggered - -- - end,"p2p") - end) -end -if net.autoInit then - net.aft.init() -end diff --git a/examples/love2d Threading Example/core/net/relay.lua b/examples/love2d Threading Example/core/net/relay.lua deleted file mode 100644 index f1f267c..0000000 --- a/examples/love2d Threading Example/core/net/relay.lua +++ /dev/null @@ -1,24 +0,0 @@ -require("net") -net:registerModule("relay",{1,0,0}) -net.OnServerCreated:connect(function(s) - s.OnDataRecieved(function(self,data,CID_OR_HANDLE,IP_OR_HANDLE,PORT_OR_IP) - local IP="" - if self.Type=="tcp" then - error("Relays only work when using UDP or AUDP! They will not function with TCP! Support may one day be added for TCP!") - else - IP=IP_OR_HANDLE - end - local cmd,dat=data:match("!relay! (%S-) (.+)") - if cmd == "RELAY" then - -- - elseif cmd == "LOAD" then - local cpuload=multi:getLoad() - self:send(IP_OR_HANDLE,"!relay! LOAD "..cpuload,PORT_OR_IP) - end - end,"relay") -end) -net.OnClientCreated:connect(function(c) - c.OnDataRecieved(function(self,data) - -- - end,"relay") -end) diff --git a/examples/love2d Threading Example/core/net/settings.lua b/examples/love2d Threading Example/core/net/settings.lua deleted file mode 100644 index de9c190..0000000 --- a/examples/love2d Threading Example/core/net/settings.lua +++ /dev/null @@ -1,48 +0,0 @@ -require("net") ---General Stuff ---[[ What this module does! -Adds -net.settings:init() -server:regSetting(namespace,setting) -]] -net:registerModule("settings",{1,0,0}) -net.settings.config={} -function net.settings:init() -- calling this initilizes the library and binds it to the servers and clients created - --Server Stuff - net.OnServerCreated:connect(function(s) - print("The Settings Module has been loaded onto the server!") - s.OnDataRecieved(function(self,data,cid,ip,port) -- when the server recieves data this method is triggered - local namespace,args=data:match("!settings! (%s+) (.+)") - local args - if namespace then - for i,v in pairs(net.settings.config) do - args={data:match(v[1])} - if #args~=0 then - v[2]:Fire(self,data,cid,ip,port,unpack(args)) - break - end - end - end - end,"settings") - function s:regSetting(namespace,settings) - if not net.settings.config[namespace] then - net.settings.config[namespace]={} - end - local connection=multi:newConnection() - table.insert(net.settings.config[namespace],{"!settings! "..namespace.." "..settings,connection}) - return connection - end - end) - --Client Stuff - net.OnClientCreated:connect(function(c) - c.OnDataRecieved:(function(self,data) -- when the client recieves data this method is triggered - --First Lets make sure we are getting Setting data - end,"setings") - function sendSetting(namespace,args) - self:send("!settings! "..namespace.." "..args) - end - end) -end -if net.autoInit then - net.settings:init() -end diff --git a/examples/love2d Threading Example/core/net/settingsWIP.lua b/examples/love2d Threading Example/core/net/settingsWIP.lua deleted file mode 100644 index de9c190..0000000 --- a/examples/love2d Threading Example/core/net/settingsWIP.lua +++ /dev/null @@ -1,48 +0,0 @@ -require("net") ---General Stuff ---[[ What this module does! -Adds -net.settings:init() -server:regSetting(namespace,setting) -]] -net:registerModule("settings",{1,0,0}) -net.settings.config={} -function net.settings:init() -- calling this initilizes the library and binds it to the servers and clients created - --Server Stuff - net.OnServerCreated:connect(function(s) - print("The Settings Module has been loaded onto the server!") - s.OnDataRecieved(function(self,data,cid,ip,port) -- when the server recieves data this method is triggered - local namespace,args=data:match("!settings! (%s+) (.+)") - local args - if namespace then - for i,v in pairs(net.settings.config) do - args={data:match(v[1])} - if #args~=0 then - v[2]:Fire(self,data,cid,ip,port,unpack(args)) - break - end - end - end - end,"settings") - function s:regSetting(namespace,settings) - if not net.settings.config[namespace] then - net.settings.config[namespace]={} - end - local connection=multi:newConnection() - table.insert(net.settings.config[namespace],{"!settings! "..namespace.." "..settings,connection}) - return connection - end - end) - --Client Stuff - net.OnClientCreated:connect(function(c) - c.OnDataRecieved:(function(self,data) -- when the client recieves data this method is triggered - --First Lets make sure we are getting Setting data - end,"setings") - function sendSetting(namespace,args) - self:send("!settings! "..namespace.." "..args) - end - end) -end -if net.autoInit then - net.settings:init() -end diff --git a/examples/love2d Threading Example/core/net/sft.lua b/examples/love2d Threading Example/core/net/sft.lua deleted file mode 100644 index b695fc9..0000000 --- a/examples/love2d Threading Example/core/net/sft.lua +++ /dev/null @@ -1,179 +0,0 @@ -require("net") ---General Stuff ---[[ What this module does! -Adds - -]] -function io.fileExists(path) - g=io.open(path or '','r') - if path =='' then - p='empty path' - return nil - end - if g~=nil and true or false then - p=(g~=nil and true or false) - end - if g~=nil then - io.close(g) - else - return false - end - return p -end -net:registerModule("sft",{1,0,0}) -function net.sft:init() -- calling this initilizes the library and binds it to the servers and clients created - --Server Stuff - net.OnServerCreated:connect(function(s) - print("The sft(Simple File Transfer) Module has been loaded onto the server!") - if s.Type~="tcp" then - print("It is recomended that you use tcp to transfer files!") - end - s.transfers={} - s.OnUploadRequest=multi:newConnection() -- create a sft event - s.OnFileUploaded=multi:newConnection() -- create a sft event - s.OnDownloadRequest=multi:newConnection() - s.OnDataRecieved(function(self,data,cid,ip,port) -- when the server recieves data this method is triggered - --First Lets make sure we are getting sft data - --filename,dat=data:match("!sft! (%S-) (%S+)") - local cmd,arg1,arg2=data:match("!sft! (%S-) (%S-) (.+)") - if cmd=="tstart" then - local rets=self.OnUploadRequest:Fire(self,cid,ip,port) - for i=1,#rets do - if rets[i][1]==false then - print("Server refused to accept upload request!") - self:send(ip,"!sft! CANTUPLOAD NIL NIL",port) - return - end - end - local ID,streamable=arg1:match("(.+)|(.+)") - local file,hash=arg2:match("(.+)|(.+)") - if streamable~="NIL" then - self.transfers[ID]={bin.stream(streamable,false),hash,file} - else - self.transfers[ID]={bin.new(""),hash,file} - end - return - elseif cmd=="transfer" then - if self.transfers[arg1]~=nil then - self.transfers[arg1][1]:tackE(bin.fromhex(arg2)) - --print(self.transfers[arg1][1]:getSize()) - end - return - elseif cmd=="tend" then - if self.transfers[arg1]~=nil then - if self.transfers[arg1][1]:getHash(32)==self.transfers[arg1][2] then - self.OnFileUploaded:Fire(self,self.transfers[arg1][1],self.transfers[arg1][3],"Hash Good!") - else - print("Hash Error!") - self.OnFileUploaded:Fire(self,self.transfers[arg1][1],self.transfers[arg1][3],"Hash Bad!") - end - self.transfers[arg1]=nil - end - return - end - local filename=cmd - local dat=arg1 - if filename==nil then return end - local rets=self.OnDownloadRequest:Fire(self,cid,ip,port) - for i=1,#rets do - if rets[i][1]==false then - print("Server refused to accept download request!") - self:send(ip,"!sft! CANTREQUEST NIL NIL",port) - return - end - end - if io.fileExists(filename) then - --Lets first load the file - local file=bin.stream(filename,false) - local size=file:getSize() - local pieceSize=512 - local pieces=math.ceil(size/pieceSize) - local step=multi:newStep(1,pieces) - step.TransferID=tostring(math.random(1000,9999)) - step.sender=self - step.ip=ip - step.port=port - step.pieceSize=pieceSize - step:OnStart(function(self) - self.sender:send(self.ip,"!sft! TSTART "..self.TransferID.."|"..dat.." "..filename.."|"..file:getHash(32),self.port) - end) - step:OnStep(function(pos,self) - self:hold(.01) - self.sender:send(self.ip,"!sft! TRANSFER "..self.TransferID.." "..bin.tohex(file:sub(((self.pieceSize*pos)+1)-self.pieceSize,self.pieceSize*pos)),self.port) - end) - step:OnEnd(function(self) - self.sender:send(self.ip,"!sft! TEND "..self.TransferID.." NIL",self.port) - end) - else - self:send(ip,"!sft! CANTREQUEST NIL NIL",port) - end - end,"sft") - end) - --Client Stuff - net.OnClientCreated:connect(function(c) - c.transfers={} - c.OnTransferStarted=multi:newConnection() -- create a sft event - c.OnTransferFinished=multi:newConnection() -- create a sft event - c.OnFileRequestFailed=multi:newConnection() -- create a sft event - c.OnFileUploadFailed=multi:newConnection() -- create a sft event - c.OnDataRecieved(function(self,data) -- when the client recieves data this method is triggered - --First Lets make sure we are getting sft data - local cmd,arg1,arg2=data:match("!sft! (%S-) (%S-) (.+)") - if cmd=="TSTART" then - local ID,streamable=arg1:match("(.+)|(.+)") - local file,hash=arg2:match("(.+)|(.+)") - if streamable~="NIL" then - self.transfers[ID]={bin.stream(streamable,false),hash,file} - else - self.transfers[ID]={bin.new(""),hash,file} - end - self.OnTransferStarted:Fire(self) - elseif cmd=="TRANSFER" then - self.transfers[arg1][1]:tackE(bin.fromhex(arg2)) - elseif cmd=="TEND" then - if self.transfers[arg1][1]:getHash(32)==self.transfers[arg1][2] then - self.OnTransferFinished:Fire(self,self.transfers[arg1][1],self.transfers[arg1][3],"Hash Good!") - else - print("Hash Error!") - self.OnTransferFinished:Fire(self,self.transfers[arg1][1],self.transfers[arg1][3],"Hash Bad!") - end - self.transfers[arg1]=nil - elseif cmd=="CANTREQUEST" then - self.OnFileRequestFailed:Fire(self,"Could not request the file for some reason!") - elseif cmd=="CANTUPLOAD" then - self.OnFileUploadFailed:Fire(self,"Could not upload the file for some reason!") - end - end,"sft") - function c:uploadFile(filename) - if io.fileExists(filename) then - local file=bin.stream(filename,false) - local size=file:getSize() - local pieceSize=512 - local pieces=math.ceil(size/pieceSize) - local step=multi:newStep(1,pieces) - step.TransferID=tostring(math.random(1000,9999)) - step.sender=self - step.pieceSize=pieceSize - step:OnStart(function(self) - self.sender:send("!sft! tstart "..self.TransferID.."|NIL "..filename.."|"..file:getHash(32)) - end) - step:OnStep(function(pos,self) - self:hold(.01) - self.sender:send("!sft! transfer "..self.TransferID.." "..bin.tohex(file:sub(((self.pieceSize*pos)+1)-self.pieceSize,self.pieceSize*pos))) - end) - step:OnEnd(function(self) - print("Request done!") - self.sender:send("!sft! tend "..self.TransferID.." NIL") - end) - else - self.OnFileUploadFailed:Fire(self,filename,"File does not exist!") - end - end - function c:requestFile(filename) - self:send("!sft! "..filename.." NIL NIL NIL") - end - end) -end -if net.autoInit then - net.sft.init() -end diff --git a/examples/love2d Threading Example/core/net/status.lua b/examples/love2d Threading Example/core/net/status.lua deleted file mode 100644 index ae79213..0000000 --- a/examples/love2d Threading Example/core/net/status.lua +++ /dev/null @@ -1,44 +0,0 @@ -print([[ -the 'admin' module STATUS: 0 -the 'aft' module STATUS: 9 -the 'chatting' module STATUS: 5 -the 'db' module STATUS: 1 -the 'email' module STATUS: 2 -the 'identity' module STATUS: 7 -the 'inbox' module STATUS: 1 -the 'init' module STATUS: 9 Not a module, but the core of the program -the 'logging' module STATUS: 8 -the 'p2p' module STATUS: 1 -the 'settings' module STATUS: 3 -the 'sft' module STATUS: 10 -the 'status' module STATUS: 5 -the 'threading' module STATUS: 1 -the 'users' module STATUS: 1 -the 'version' module STATUS: 2 - -STATUS: -0: The idea is there but no progress to actual coding has been made -1: The idea has been coded and thoughts well defined. However only a frame is existing atm -2: The module has limited functionality, but gets its basic function through -3: The module has decent functionality, but needs much more -4: The module functions are stable and works great, however not all of the original idea has been completed -5: The module functions are stable and works great, most of the functions have been fleshed out aside for a few minor ones -6: The module has all features completed and is stable for average use, minor bugs are present. -7: The module has few to no bugs, and is currently being made more secure -8: The module is very secure and odds are it wont crash unless they were implemented wrong -9: The module has most if not all exception handled so even incorrect implementation will be 'error free' Probably wont change, but if it does it will be a huge change! -10: The module is never going to change from its current status! It is done. - -NOTE: once a module reaches a status of 4, it will always be backward compatable. server-client relations will be safe! - -Each module has a version -1.0.0 -A.M.m -addition.Major.minor -whenever a new addition is added the A is increased... You must update to make use of that feature -When a major addition or change Major is incresed. This can be code breaking... However I will try my best to make at least client side code compatible with future changes -when a minor addition or change is made minor in incresed - -Why client side stabality in code changes? -Until the update module can seamless update your modules I will ensure that client code can work regardless of server version starting from this version -]]) diff --git a/examples/love2d Threading Example/core/net/threading.lua b/examples/love2d Threading Example/core/net/threading.lua deleted file mode 100644 index 50299ef..0000000 --- a/examples/love2d Threading Example/core/net/threading.lua +++ /dev/null @@ -1,41 +0,0 @@ ---[=[ About This Module! - This module is server side only! (Might add client side if requested) - Aim is to make each lane (thread) have no more than 'n' number of connections - This module hyjacks the multi:newConnection() function to seemlessly add support for threads without you having to change much - As long as each server-client connection is isolated you should be fine - The chatting module however IS NOT an isolated module, so take a look at how data was handled in that module to allow for both - threaded and non threaded use - - How? - When this module is loaded all server creation is altered by passing a proxyServer instead of an actual server object - for example: - proxy=net:newTCPServer(12345) - proxy:OnDataRecieved(function(self,data,cid,ip,port) - self:send("My data!") - end) - the real server instance could be on any of the threads. Careful! While using this is seemless becareful of IO opperations! -]=] ---~ net:registerModule("threading",{1,0,0}) ---~ if not(lanes) then error("Require the lanes module!") end ---~ local serverlinda = lanes.linda() ---~ net.threading.newServer=net.newServer -- store the original method ---~ net.threading.newTCPServer=net.newTCPServer -- store the original method ---~ net.threading.proxy={} -- namespace for the proxy stuff. Because of the desgin intention of both UDP/TCP servers Only one proxy is needed -print({}) - ---~ lanes=require("lanes") ---~ serverlinda = lanes.linda() ---~ mt={ ---~ __index=function(t,k) print("IND",t,k) end, ---~ __newindex=function(t,k,v) print("NewIND",t,k,v) end, ---~ } ---~ test={} ---~ setmetatable(test,mt) ---~ test.a="hi" ---~ test.a=true ---~ g=test['a'] ---~ print(test.b) - - ---~ setmetatable(net.threading.proxy,mt) -- set the proxies metatable, to prevent bleeding only create one server. - diff --git a/examples/love2d Threading Example/core/net/threadingWIP.lua b/examples/love2d Threading Example/core/net/threadingWIP.lua deleted file mode 100644 index c83b2c2..0000000 --- a/examples/love2d Threading Example/core/net/threadingWIP.lua +++ /dev/null @@ -1,37 +0,0 @@ ---[=[ About This Module! - This module is server side only! (Might add client side if requested) - Aim is to make each lane (thread) have no more than 'n' number of connections - This module hyjacks the multi:newConnection() function to seemlessly add support for threads without you having to change much - As long as each server-client connection is isolated you should be fine - The chatting module however IS NOT an isolated module, so take a look at how data was handled in that module to allow for both - threaded and non threaded use - - How? - When this module is loaded all server creation is altered by passing a proxyServer instead of an actual server object - for example: - proxy=net:newTCPServer(12345) - proxy:OnDataRecieved(function(self,data,cid,ip,port) - self:send("My data!") - end) - the real server instance could be on any of the threads. Careful! While using this is seemless becareful of IO opperations! -]=] ---~ net:registerModule("threading",{1,0,0}) ---~ if not(lanes) then error("Require the lanes module!") end ---~ local serverlinda = lanes.linda() ---~ net.threading.newServer=net.newServer -- store the original method ---~ net.threading.newTCPServer=net.newTCPServer -- store the original method ---~ net.threading.proxy={} -- namespace for the proxy stuff. Because of the desgin intention of both UDP/TCP servers Only one proxy is needed -lanes=require("lanes") -serverlinda = lanes.linda() -mt={ - __index=function(t,k) print("IND",t,k) end, - __newindex=function(t,k,v) print("NewIND",t,k,v) end, -} -test={} -setmetatable(test,mt) -test.a="hi" -test.a=true -g=test['a'] -print(test.b) ---~ setmetatable(net.threading.proxy,mt) -- set the proxies metatable, to prevent bleeding only create one server. - diff --git a/examples/love2d Threading Example/core/net/users.lua b/examples/love2d Threading Example/core/net/users.lua deleted file mode 100644 index f99f2ec..0000000 --- a/examples/love2d Threading Example/core/net/users.lua +++ /dev/null @@ -1,37 +0,0 @@ -require("net.identity") --[[ This module extends the functions of the identity module -It aims to make the handling of users who are not online more seamless. -Without this handling offline users is a pain. -]] -net:registerModule("users",{1,0,0}) -net.users.online={} -- all online users and offline users -net.users.offline={} -- all online users and offline users -net.OnServerCreated:connect(function(s) - s.OnUserLoggedIn(function(user,cid,ip,port,dTable) - -- - end) - s.OnDataRecieved(function(self,data,CID_OR_HANDLE,IP_OR_HANDLE,PORT_OR_IP) - if self:userLoggedIn(cid) then -- If the user is logged in we do the tests - -- - else - return - end - end,"users") -end) -net.OnClientCreated:connect(function(c) - c.OnUserList=multi:newConnection() - c.OnDataRecieved(function(self,data) - -- - end,"users") - function c:searchUsers(nickname) -- sends a query to the server, returns list of userids and nicks close to the query - -- - end - function c:addFriend(USERID) - -- - end - function c:removeFriend(USERID) - -- - end - function c:getFriends(USERID) - -- - end -end) diff --git a/examples/love2d Threading Example/core/net/version.lua b/examples/love2d Threading Example/core/net/version.lua deleted file mode 100644 index 258bb4b..0000000 --- a/examples/love2d Threading Example/core/net/version.lua +++ /dev/null @@ -1,43 +0,0 @@ -require("net") -require("net.aft") -net:registerModule("version",{1,0,0}) -- allows communication of versions for modules -net.version.HOSTS={ - ["Lua"]=1, - ["LuaJIT"]=1, - ["Love2d"]=2, -- Yes love2d uses luaJIT, but the filesystem works a bit differently - ["Corona"]=3, -} -net.version.OS={ - ["Windows"]=1, - ["Unix"]=2, - ["RPI"]=3, -} ---net.version.EOL="\60\69\110\100\45\79\102\45\70\105\108\101\45\84\114\97\110\115\102\101\114\62" -net.OnServerCreated:connect(function(s) - s.OnDataRecieved(function(self,data,CID_OR_HANDLE,IP_OR_HANDLE,PORT_OR_IP) - local cmd,arg1,arg2=data:match("!version! ") - end,"version") - s.OnClientConnected(function(self,CID_OR_HANDLE,IP_OR_HANDLE,PORT_OR_IP) - multi:newFunction(function(func) -- anom func, allows for fancy multitasking - multi:newFunction(function(self) - local range=self:newRange() - for i in range(1,#self.loadedModules) do - local mod=self.loadedModules[i] - self:send(IP_OR_HANDLE,"!version! CHECK "..mod.." NIL",PORT_OR_IP) -- sends command to client to return the version of the module - end - end)() - func=nil -- we dont want 1000s+ of these anom functions lying around - end)()-- lets call the function - self:send(IP_OR_HANDLE,"!version! HOST NIL NIL",PORT_OR_IP) - end) -end) -net.OnClientCreated:connect(function(c) - c.OnDataRecieved(function(self,data) - local cmd,module,arg1=data:match("!version! (%S+) (%S+) (%S+)") - if cmd=="CHECK" then - self:send("!version! VER "..self.loadedModules[module].." "..net.getModuleVersion(module)) - elseif cmd=="UPDATE" then - -- - end - end,"version") -end) diff --git a/examples/love2d Threading Example/core/parseManager/AICM.lua b/examples/love2d Threading Example/core/parseManager/AICM.lua deleted file mode 100644 index 23496fa..0000000 --- a/examples/love2d Threading Example/core/parseManager/AICM.lua +++ /dev/null @@ -1,37 +0,0 @@ -AICM={} -AICM.functions={ - getAICMVersion=function(self) - return "1.0.0" - end, -} -function AICM:InitSyntax(obj,name) - obj:debug("Now using the Artificial Intelligence Communication module!") - obj.OnExtendedBlock(self.blockModule) - obj.OnCustomSyntax(self.syntaxModule) - obj:define(self.functions) -end -AICM.syntaxModule=function(self,line) - pVars,mStr=line:match("p%((.-)%)(.+)") - if pVars then - local vRef,vars=pVars:match("(.-):(.+)") - if vars:find(",") then - vars={unpack(vars:split(","))} - else - vars={vars} - end - tab={self:varExists(vRef):match(mStr)} -- self:varExists allows for all internal structures to just work - for i=1,#tab do - if vars[i] then - self._variables[vars[i]]=tab[i] - end - end - self:p() -- requried to progress the script - return { - text=line, - Type="AICMModule" - } - end -end -AICM.blockModule=function(obj,name,t,chunk,filename) - -- -end diff --git a/examples/love2d Threading Example/core/parseManager/EBIM.lua b/examples/love2d Threading Example/core/parseManager/EBIM.lua deleted file mode 100644 index 08ac193..0000000 --- a/examples/love2d Threading Example/core/parseManager/EBIM.lua +++ /dev/null @@ -1,71 +0,0 @@ -EBIM={} -EBIM.functions={ - getEBIMVersion=function(self) - return "1.0.0" - end, -} -EBIM.registry={} -function EBIM:registerEBlock(name,func) - self.registry[name]=func -end -function EBIM:InitSyntax(obj,name) - obj:debug("Now using the Extended Block Interface module!") - obj.OnExtendedBlock(self.blockModule) - obj.OnCustomSyntax(self.syntaxModule) - obj:define(self.functions) -end -EBIM.syntaxModule=function(self,line) - local cmd,args=line:match("(.-) (.+):") - if cmd then - local goal=nil - local _tab={} - for i=self.pos+1,#self._cblock do - if self._cblock[i]=="end"..cmd then - goal=i - break - else - table.insert(_tab,self._cblock[i]) - end - end - if goal==nil then - self:pushError("'end"..cmd.."' Expected to close '"..cmd.."'") - end - if EBIM.registry[cmd] then - EBIM.registry[cmd](self,args,_tab) - self.pos=goal+1 - else - self:pushError("Unknown command: "..cmd) - end - return { - Type="EBIM-Data", - text=cmd.." Block" - } - else - return - end -end -EBIM.blockModule=function(obj,name,t,chunk,filename) - --print(">: ",obj,name,t,chunk,filename) -end -EBIM:registerEBlock("string",function(self,args,tab) - local str={} - for i=1,#tab do - table.insert(str,tab[i]) - end - self:setVariable(args,table.concat(str,"\n")) -end) -EBIM:registerEBlock("list",function(self,args,tab) - local str={} - for i=1,#tab do - table.insert(str,self:varExists(tab[i])) - end - self:setVariable(args,str) -end) -EBIM:registerEBlock("dict",function(self,args,tab) - local str={} - for i=1,#tab do - local a,b=tab[i]:match("(.-):%s*(.+)") - str[a]=self:varExists(b) - end - self:setVariable(args,str) -end) diff --git a/examples/love2d Threading Example/core/parseManager/bytecode.lua b/examples/love2d Threading Example/core/parseManager/bytecode.lua deleted file mode 100644 index 26fb46f..0000000 --- a/examples/love2d Threading Example/core/parseManager/bytecode.lua +++ /dev/null @@ -1,44 +0,0 @@ --- In an attempt to speed up my library I will use a virtual machine that runs bytecode -compiler={} -compiler.cmds={ -- list of all of the commands - EVAL="\01", -- evaluate - SPLT="\02", -- split - TRIM="\03", -- trim - VEXT="\04", -- variable exists - ILST="\05", -- is a list - LSTR="\06", -- load string - FCAL="\07", -- Function call - SVAR="\08", -- set variable - LOAD="\09", -- load file - LAOD="\10", -- _load file - DEFN="\11", -- define external functions - HCBK="\12", -- Has c Block - CMBT="\13", -- combine truths - SETB="\14", -- set block - STRT="\15", -- start - PERR="\16", -- push error - PROG="\17", -- progress - PHED="\18", -- parse header - SSLT="\19", -- split string - NEXT="\20", -- next - -- Needs refining... One step at a time right! -} -function compiler:compile(filename) -- compiles the code into bytecode - -- First we load the code but don't run it - local engine=parseManager:load(filename) - -- This captures all of the methods and important info. This also ensures that the compiler and interperter stay in sync! - local bytecodeheader=bin.new() -- header will contain the order of blocks and important flags - local bytecode=bin.newDataBuffer() -- lets leave it at unlimited size because we don't know how long it will need to be - local functions={} -- will be populated with the important methods that must be preloaded - local prebytecode={} -- this contains bytecode that has yet to be sterilized - for blockname,blockdata in pairs(engine._chunks) do - -- lets get some variables ready - local code,_type,nextblock,filename=blockdata[1],blockdata[2],blockdata.next,blockdata.file - -- note nextblock may be nil on 2 condidions. The first is when the leaking flag is disabled and the other is when the block in question was the last block defined - local lines=bin._lines(code) - print("\n["..blockname.."]\n") - for i=1,#lines do - print(lines[i]) - end - end -end diff --git a/examples/love2d Threading Example/core/parseManager/init.lua b/examples/love2d Threading Example/core/parseManager/init.lua deleted file mode 100644 index af90212..0000000 --- a/examples/love2d Threading Example/core/parseManager/init.lua +++ /dev/null @@ -1,1277 +0,0 @@ -function trim(s) - return s:match'^()%s*$' and '' or s:match'^%s*(.*%S)' -end -parseManager={} -parseManager._VERSION={1,0,0} -dialogueManager=parseManager -- for backwards purposes -parseManager.OnExtendedBlock=multi:newConnection(true) -- true protects the module from crashes -parseManager.OnCustomSyntax=multi:newConnection(true) -- true protects the module from crashes -function string:split( inSplitPattern, outResults ) - if not outResults then - outResults = {} - end - local theStart = 1 - local theSplitStart, theSplitEnd = string.find( self, inSplitPattern, theStart ) - while theSplitStart do - table.insert( outResults, string.sub( self, theStart, theSplitStart-1 ) ) - theStart = theSplitEnd + 1 - theSplitStart, theSplitEnd = string.find( self, inSplitPattern, theStart ) - end - table.insert( outResults, string.sub( self, theStart ) ) - return outResults -end -function parseManager:debug(txt) - if self.stats.debugging then - self._methods:debug(txt) - end -end -function parseManager.split(s,pat) - local pat=pat or "," - local res = {} - local start = 1 - local state = 0 - local c = '.' - local elem = '' - for i = 1, #s do - c = s:sub(i, i) - if state == 0 or state == 3 then -- start state or space after comma - if state == 3 and c == ' ' then - state = 0 -- skipped the space after the comma - else - state = 0 - if c == '"' or c=="'" then - state = 1 - elem = elem .. '"' - elseif c=="[" then - state = 1 - elem = elem .. '[' - elseif c == pat then - res[#res + 1] = elem - elem = '' - state = 3 -- skip over the next space if present - else - elem = elem .. c - end - end - elseif state == 1 then -- inside quotes - if c == '"' or c=="'" then --quote detection could be done here - state = 0 - elem = elem .. '"' - elseif c=="]" then - state = 0 - elem = elem .. ']' - elseif c == '\\' then - state = 2 - else - elem = elem .. c - end - elseif state == 2 then -- after \ in string - elem = elem .. c - state = 1 - end - end - res[#res + 1] = elem - return res -end -parseManager._chunks={} -parseManager._cblock={} -parseManager._cblockname="" -parseManager._pos=1 -parseManager._labels={ - -- {chunkname,pos} -} -parseManager.stats={ - leaking=false, - debugging=false, - topdown=true, - forseelabels=true, -} -parseManager._types={} -parseManager.__index=parseManager -parseManager._variables={__TYPE="ENV"} -parseManager.defualtENV=parseManager._variables -function parseManager:varExists(var) - if var==nil or var=="nil" then return end - if type(var)=="userdata" then return var end - if tonumber(var) then - return tonumber(var) - end - local aa,bb=var:match("(.-)%[\"(.-)\"%]") - if aa and bb then - return self.defualtENV[aa][bb] - end - if var:find('"') then - return self:parseHeader(var:sub(2,-2),self.defualtENV) - end - if var:find("%[%]") then - return {} - end - if var:sub(1,1)=="[" and var:sub(-1,-1)=="]" then - local list=var:match("[(.+)]") - if not list then - self:pushError("Invalid List assignment!") - end - local t=list:split(",") - local nlist={} - local a=":)" - for i=1,#t do - a=self:varExists(t[i]) - if a then - table.insert(nlist,a) - end - end - return nlist - end - if var=="true" then - return true - elseif var=="false" then - return false - end - local a,b=var:match("(.-)%[(.-)%]") - if a and b then - if type(self.defualtENV[a])=="table" then - if b=="-1" then - return self.defualtENV[a][#self.defualtENV[a]] - elseif b=="#" then - return self.defualtENV[a][math.random(1,#self.defualtENV[a])] - else - return self.defualtENV[a][tonumber(b) or self:varExists(b)] - end - end - if type(self.defualtENV[var])=="table" then - return self.defualtENV[var] - end - end - return self.defualtENV[var] or var -- if all tests fail, just pass on the data for the function to manage -end -function parseManager:isList(var) - local a,b=var:match("(.-)%[(.-)%]") - if not a or b then return end - if type(self.defualtENV[a])=="table" then - if b=="-1" then - return self.defualtENV[a][#self.defualtENV[a]] - else - return self.defualtENV[a][tonumber(b)] - end - end - return -end -function parseManager:loadString(data) - self:_load(bin.new(data),self) -end -parseManager.loadeddata={} -parseManager.envs={} -parseManager._methods={ - getLength=function(self,list) - return #(self:varExists(list) or {}) - end, - emptyList=function(self) - return {} - end, - DEBUG=function(self,text) - print(text) - end, - DIS=function(self,var) - print(var) - end, - SEED=function(self,n) - math.randomseed(tonumber(self:varExists(n) or n) or os.time()) - end, - delElem=function(self,l,i) - table.remove(l,i) - end, - addElem=function(self,l,d,i) - table.insert(l,(i or -1),d) - return l - end, - RANDOM=function(self,v1,v2) - if v1 then - return math.random(1,v1) - elseif v1 or v2 then - return math.random(tonumber(v1),tonumber(v2)) - else - return math.random() - end - end, - CALC=function(self,eq) - return self:evaluate(eq) - end, - GOTOV=function(self,label) - print(self:varExists(label)) - self._methods.GOTO(self,self:varExists(label)) - end, - GOTO=function(self,label) - label=label:gsub("-","") - if label=="__LASTGOTO" then - self:setBlock(self._labels.__LASTGOTO[1]) - self.pos=self._labels[label][2] - return true - end - --search current block for a label - if self.pos==nil then - error("Attempt to load a non existing block from the host script!") - end - for i=self.pos,#self._cblock do - local line=self._cblock[i] - local labeltest=line:match("::(.-)::") - if labeltest==label then - self._labels["__LASTGOTO"]={self._cblockname,self.pos} - self.pos=i - return true - end - end - --search for saved labels - if self._labels[label] then - self._labels["__LASTGOTO"]={self._cblockname,self.pos} - self:setBlock(self._labels[label][1]) - self.pos=self._labels[label][2] - return true - end - --search other blocks if enabled for labels - if self.stats.forseelabels then - for i,v in pairs(self._chunks) do - local chunks=bin._lines(v[1]) - for p=1,#chunks do - local line=chunks[p] - local labeltest=line:match("::(.-)::") - if labeltest==label then - self._labels["__LASTGOTO"]={self._cblockname,self.pos} - self:setBlock(i) - self.pos=p-1 - return true - end - end - end - end - if self.stats.forseelabels then - if self._methods.GOTOV(self,label) then return end - end - self:pushError("Attempt to goto a non existing label! You can only access labels in the current scope! Or labels that the code has seen thus far! "..label.." does not exist as a label!") - end, - QUIT=function() - os.exit() - end, - EXIT=function(self) - self.pos=math.huge - end, - TYPE=function(self,val) - return type(val) - end, - SAVE=function(self,filename) - if trim(filename)=="" then filename="saveData.sav" end - local t=bin.new() - t:addBlock(self.defualtENV) - t:addBlock(self._cblockname) - t:addBlock(self.pos) - t:addBlock(self._labels) - t:tofile(filename) - end, - UNSAVE=function(self,filename) - if trim(filename)=="" then filename="saveData.sav" end - self.defualtENV={} - os.remove(filename) - end, - RESTORE=function(self) - if not(self.loadeddata.load) then self:pushError("A call to RESTORE without calling LOAD") end - self.defualtENV=self.loadeddata:getBlock("t") - self:setBlock(self.loadeddata:getBlock("s")) - self.pos=self.loadeddata:getBlock("n") - self._labels=self.loadeddata:getBlock("t") - end, - LOAD=function(self,filename) - print(filename) - if not filename then filename="saveData.sav" end - if io.fileExists(filename) then - self.loadeddata=bin.load(filename) - return 1 - end - return 0 - end, - JUMP=function(self,to) - self:setBlock(to) - end, - SKIP=function(self,n) - self.pos=self.pos+tonumber(n) - end, - PRINT=function(self,text) print(text) end, - TRIGGER=function(self,to) - self:setBlock(to) - end, - COMPARE=function(self,t,v1,v2,trueto,falseto) -- if a blockname is __STAY then it will continue on - if t=="=" or t=="==" then - if v1==v2 then - self:setBlock(trueto) - else - self:setBlock(falseto) - end - elseif t==">=" then - if v1>=v2 then - self:setBlock(trueto) - else - self:setBlock(falseto) - end - elseif t=="<=" then - if v1<=v2 then - self:setBlock(trueto) - else - self:setBlock(falseto) - end - elseif t==">" then - if v1>v2 then - self:setBlock(trueto) - else - self:setBlock(falseto) - end - elseif t=="<" then - if v1"..a - end) - local choicetest=line:find("<$") or line:find("^<") - local lasttest=line:match("^\"(.+)\"$") - local labeltest=line:match("::(.-)::") - local var,list=line:match("([%w_]-)=%[(.+)%]") - local assignA,assignB=line:match("(.-)=(.+)") - local cond,f1,f2=line:match("^if%s*(.-)%s*then%s*([%w-%(%)]-)%s*|%s*([%w-%(%)]*)") - if choicetest then - local c=self._chunks[self._cblockname][1] - local test=bin.new(c:match("\"<(.-)>")) - test:fullTrim(true) - local header=line:match("\"(.-)\"<") - local stuff=test:lines() - local cho,met={},{} - for i=1,#stuff do - local a1,a2=stuff[i]:match("\"(.-)\" (.+)") - a1=tostring(self:parseHeader(a1,env)) - table.insert(cho,a1) - table.insert(met,a2) - end - return { - Type="choice", - text=tostring(self:parseHeader(header,env)), - choices=cho, - methods=met, - blocktype=self._chunks[self._cblockname][2] - } - elseif cond and f1 and f2 then - conds={["andors"]={}} - mtc="" - for a,b in cond:gmatch("(.-)([and ]+[or ]+)") do - b=b:gsub(" ","") - mtc=mtc..".-"..b - v1,c,v2=a:match("(.-)%s*([<>!~=]+)%s*(.+)") - table.insert(conds,{v1,c,v2}) - table.insert(conds.andors,b) - end - a=cond:match(mtc.."%s*(.+)") - v1,c,v2=a:match("(.-)%s*([<>!~=]+)%s*(.+)") - table.insert(conds,{v1,c,v2}) - truths={} - for i=1,#conds do - conds[i][1]=conds[i][1]:gsub("\"","") - conds[i][3]=conds[i][3]:gsub("\"","") - if conds[i][2]=="==" then - table.insert(truths,tostring((self:varExists(conds[i][1]) or conds[i][1]))==tostring((self:varExists(conds[i][3]) or conds[i][3]))) - elseif conds[i][2]=="!=" or conds[i][2]=="~=" then - table.insert(truths,tostring((self:varExists(conds[i][1]) or conds[i][1]))~=tostring((self:varExists(conds[i][3]) or conds[i][3]))) - elseif conds[i][2]==">=" then - table.insert(truths,tonumber((self:varExists(conds[i][1]) or conds[i][1]))>=tonumber((self:varExists(conds[i][3]) or conds[i][3]))) - elseif conds[i][2]=="<=" then - table.insert(truths,tonumber((self:varExists(conds[i][1]) or conds[i][1]))<=tonumber((self:varExists(conds[i][3]) or conds[i][3]))) - elseif conds[i][2]==">" then - table.insert(truths,tonumber((self:varExists(conds[i][1]) or conds[i][1]))>tonumber((self:varExists(conds[i][3]) or conds[i][3]))) - elseif conds[i][2]=="<" then - table.insert(truths,tonumber((self:varExists(conds[i][1]) or conds[i][1]))])(.+)") - if d then - if d=="<-" then - self:setVariable(assignA,self.defualtENV[_env][vv]) - self:p() - return { - Type="assignment", - var=assignA, - value=assignB, - env=true, - text=assignA.."="..assignB - } - elseif d=="->" then - self.defualtENV[_env][assignA]=self:varExists(vv) - self:p() - return { - Type="assignment", - var=assignA, - value=assignB, - env=true, - text=assignA.."="..assignB - } - end - end - local a1,a2=parseManager.split(assignA),parseManager.split(assignB) - for i=1,#a1 do - local a=self._methods.CALC(self,a2[i]) - if a then - a2[i]=a - end - local t=tonumber(a2[i]) - if not t then - t=a2[i] - end - env[a1[i]]=t - end - self:p() - return { - Type="assignment", - var=assignA, - value=assignB, - text=assignA.."="..assignB - } - else - local rets=self.OnCustomSyntax:Fire(self,line) - for i=1,#rets do - if type(rets[i][1])=="table" then - return rets[i][1] - else - return { - Type="unknown", - text=line - } - end - end - self:p() - return { - Type="unknown", - text=line - } - end -end -function parseManager:RunCode(code,entry,sel,env) -- returns an env or selectVarName - local file = bin.new("ENTRY "..(entry or "START").."\n"..code) - local run=parseManager:load(file) - run._methods = self._methods - run.defualtENV=self.defualtENV - run.defualtENV=self.defualtENV - for i,v in pairs(env or {}) do - run.defualtENV[i]=v - end - local t=run:start() - while true do - if t.Type=="text" then - print(t.text) - t=run:next() - elseif t.Type=="condition" then - t=run:next() - elseif t.Type=="assignment" then - t=run:next() - elseif t.Type=="label" then - t=run:next() - elseif t.Type=="method" then - t=run:next() - elseif t.Type=="choice" then - t=run:next(nil,math.random(1,#t.choices),nil,t) - elseif t.Type=="end" then - if t.text=="leaking" then -- go directly to the block right under the current block if it exists - t=run:next() - else - return (run.defualtENV[sel] or run.defualtENV) - end - elseif t.Type=="error" then - error(t.text) - else - t=run:next() - end - end -end -parseManager.symbols={} -- {sym,code} -function parseManager:registerSymbol(sym,code) - self.symbols[#self.symbols+1]={sym,code} -end -function parseManager:populateSymbolList(o) - local str="" - for i=1,#self.symbols do - str=self.symbols[i][1]..str - end - return str -end -function parseManager:isRegisteredSymbol(o,r,v) - for i=1,#self.symbols do - if self.symbols[i][1]==o then - return parseManager:RunCode(self.symbols[i][2],"CODE","ret-urn",{["l"]=r,["r"]=v,["mainenv"]=self.defualtENV}) - end - end - return false --self:pushError("Invalid Symbol "..o.."!") -end -function parseManager:evaluate(cmd,v) - v=v or 0 - local loop - local count=0 - local function helper(o,v,r) - if type(v)=="string" then - if v:find("%D") then - v=self:varExists(v) - end - end - if type(r)=="string" then - if r:find("%D") then - r=self:varExists(r) - end - end - local r=tonumber(r) or 0 - local gg=self:isRegisteredSymbol(o,r,v) - if gg then - return gg - elseif o=="+" then - return r+v - elseif o=="-" then - return r-v - elseif o=="/" then - return r/v - elseif o=="*" then - return r*v - elseif o=="^" then - return r^v - end - end - for i,v in pairs(math) do - cmd=cmd:gsub(i.."(%b())",function(a) - a=a:sub(2,-2) - if a:sub(1,1)=="-" then - a="0"..a - end - return v(self:evaluate(a)) - end) - end - cmd=cmd:gsub("%b()",function(a) - return self:evaluate(a:sub(2,-2)) - end) - for l,o,r in cmd:gmatch("(.*)([%+%^%-%*/"..self:populateSymbolList().."])(.*)") do - loop=true - count=count+1 - if l:find("[%+%^%-%*/]") then - v=self:evaluate(l,v) - v=helper(o,r,v) - else - if count==1 then - v=helper(o,r,l) - end - end - end - if not loop then return self:varExists(cmd) end - return v -end -parseManager.constructType=function(self,name,t,data,filename) - if t~="construct" then return end - --print(name,t,"[CODE]{"..data.."}") - self:registerSymbol(name,"[CODE]{"..data.."}") -end --- Let's add function -Stack = {} -function Stack:Create() - local t = {} - t._et = {} - function t:push(...) - if ... then - local targs = {...} - for _,v in ipairs(targs) do - table.insert(self._et, v) - end - end - end - function t:pop(num) - local num = num or 1 - local entries = {} - for i = 1, num do - if #self._et ~= 0 then - table.insert(entries, self._et[#self._et]) - table.remove(self._et) - else - break - end - end - return unpack(entries) - end - function t:getn() - return #self._et - end - function t:list() - for i,v in pairs(self._et) do - print(i, v) - end - end - return t -end -parseManager.funcstack=Stack:Create() -parseManager:define{ - __TRACEBACK=function(self) -- internal function to handle function calls - local t=self.funcstack:pop() - self:setBlock(t[1]) - self.pos=t[2] - -- We finished the function great. Lets restore the old env - self._methods.setENV(self,t[3]) - end -} -parseManager.funcType=function(link,name,t,data,filename) - local test,args=t:match("(function)%(*([%w,]*)%)*") - if not test then return false end - local vars={} - if args~="" then - for k, v in ipairs(parseManager.split(args)) do - table.insert(vars,v) - end - -- Time to collect local vars to populate we will use these below - end - link._chunks[name][1]=link._chunks[name][1].."\n__TRACEBACK()" - local func=function(self,...) - -- Here we will use the vars. First lets capture the args from the other side - local args={...} - -- Here we will play a matching game assigning vars to values. This cannot be done yet... - -- Now we have to change the enviroment so function vars are local to the function. - -- Also we need functions to be able to access the globals too - -- Now we invoke the createnv method - local env=self._methods.createENV(self) - -- A little messy compared to how its done within the interpreted language - -- Now we need a copy of the previous Env - -- We then invoke getEnv method - local lastEnv=self._methods.getENV(self) - -- Great now we have a new enviroment to play with and the current one - -- Next we need to store the current one somewhere - self.funcstack:push({self._cblockname,self.pos,lastEnv}) - -- We use a stack to keep track of function calls. Before I tried something else and it was a horrible mess - -- Stacks make it real nice and easy to use. We store a bit of data into the stack to use later - if self.funcstack:getn()>1024 then self:pushError("Stack Overflow!") end - -- Throw an error if the stack reaches 1024 elements. We don't want it to go forever and odds are neither does the user - -- Lets set that new env and prepare for the jump. To do this we invoke setEnv - self._methods.setENV(self,env) - -- Now lets play match making - for i=1,#vars do - self:setVariable(vars[i],args[i]) -- this method defualts to the current env - end - -- We are ready to make the jump with our stored data - self._methods.JUMP(self,name) - -- we need to be able to catch returns... This is where things get tricky. - -- We need a way to run the other code while also waiting here so we can return data - -- What we can do is return a reference to the enviroment and from there you can take what you want from the function - -- This is a really strange way to do things, but whats wrong with different - return env - end - link._methods[name]=func -end -parseManager.OnExtendedBlock(parseManager.funcType) -parseManager.constructType=function(link,name,t,data,filename) - local test,args=t:match("(construct)%(*([%w,]*)%)*") - if not test then return false end - local vars={} - if args~="" then - for k, v in ipairs(parseManager.split(args)) do - table.insert(vars,v) - end - end - link._chunks[name][1]=link._chunks[name][1].."\n__TRACEBACK()" - local func=function(self,...) - local args={...} - local env=self._methods.createENV(self) - local lastEnv=self._methods.getENV(self) - self.funcstack:push({self._cblockname,self.pos,lastEnv}) - if self.funcstack:getn()>1024 then self:pushError("Stack Overflow!") end - self._methods.setENV(self,env) - for i=1,#vars do - self:setVariable(vars[i],args[i]) - end - self._methods.JUMP(self,name) - return env - end - link._methods[name]=func -end -parseManager.OnExtendedBlock(parseManager.constructType) diff --git a/examples/love2d Threading Example/core/parseManager/interpreter.lua b/examples/love2d Threading Example/core/parseManager/interpreter.lua deleted file mode 100644 index e4a5b84..0000000 --- a/examples/love2d Threading Example/core/parseManager/interpreter.lua +++ /dev/null @@ -1,10 +0,0 @@ -engine={} -function engine:init(bytecodeFile) - self.code=bin.load(bytecodeFile).data -end ---[[OP-CODES - -]] -function engine:run(assessors) - -- -end diff --git a/examples/love2d Threading Example/core/test.dat b/examples/love2d Threading Example/core/test.dat deleted file mode 100644 index 8b9302a..0000000 Binary files a/examples/love2d Threading Example/core/test.dat and /dev/null differ diff --git a/examples/love2d Threading Example/core/test.lua b/examples/love2d Threading Example/core/test.lua deleted file mode 100644 index f551bde..0000000 --- a/examples/love2d Threading Example/core/test.lua +++ /dev/null @@ -1,18 +0,0 @@ -require("Library") -local clock = os.clock -function sleep(n) -- seconds - local t0 = clock() - while clock() - t0 <= n do end -end -function tester(test) - sleep(1) - return test*10 -end ---~ require("bin") ---~ test=bin.namedBlockManager() ---~ test["name"]="Ryan" ---~ test["age"]=21 ---~ test:tofile("test.dat") ---~ test2=bin.namedBlockManager("test.dat") ---~ print(test2["name"]) ---~ print(test2["age"]) diff --git a/examples/love2d Threading Example/main.lua b/examples/love2d Threading Example/main.lua deleted file mode 100644 index f6f0525..0000000 --- a/examples/love2d Threading Example/main.lua +++ /dev/null @@ -1,37 +0,0 @@ -require("core.Library") -GLOBAL,sThread=require("multi.integration.loveManager").init{threadNamespace="THREAD"} -- load the love2d version of the lanesManager and requires the entire multi library ---IMPORTANT --- Do not make the above local, this is the one difference that the lanesManager does not have --- If these are local the functions will have the up-values put into them that do not exist on the threaded side --- You will need to ensure that the function does not refer to any up-values in its code. It will print an error if it does though --- Also each thread has a .1 second delay! This is used to generate a random values for each thread! -require("core.GuiManager") -- allows the use of graphics in the program. -gui.ff.Color=Color.Black -multi:newSystemThread("Test_Thread_1",function() - require("multi") - test = sThread.waitFor("testthing"):init() - multi:newTLoop(function() - print("------") - for i,v in pairs(test.tab) do - print("T1",i,v) - end - end,1) - multi:mainloop() -end) -multi:newSystemThread("Test_Thread_1",function() - require("multi") - test = sThread.waitFor("testthing"):init() - multi:newTLoop(function() - print("------") - for i,v in pairs(test.tab) do - print("T2",i,v) - end - end,1) - multi:mainloop() -end) -test = multi:newSystemThreadedTable("testthing"):init() -multi:newTLoop(function() - local a,b = multi.randomString(8),multi.randomString(4) - print(">",a,b) - test[a]=b -end,1) \ No newline at end of file diff --git a/examples/love2d Threading Example/main2.lua b/examples/love2d Threading Example/main2.lua deleted file mode 100644 index f049404..0000000 --- a/examples/love2d Threading Example/main2.lua +++ /dev/null @@ -1,65 +0,0 @@ -require("core.Library") -GLOBAL,sThread=require("multi.integration.loveManager").init() -- load the love2d version of the lanesManager and requires the entire multi library ---IMPORTANT --- Do not make the above local, this is the one difference that the lanesManager does not have --- If these are local the functions will have the upvalues put into them that do not exist on the threaded side --- You will need to ensure that the function does not refer to any upvalues in its code. It will print an error if it does though --- Also each thread has a .1 second delay! This is used to generate a random values for each thread! -require("core.GuiManager") -gui.ff.Color=Color.Black -function multi:newSystemThreadedQueue(name) -- in love2d this will spawn a channel on both ends - local c={} - c.name=name - if love then - if love.thread then - function c:init() - self.chan=love.thread.getChannel(self.name) - function self:push(v) - self.chan:push(v) - end - function self:pop() - return self.chan:pop() - end - GLOBAL[self.name]=self - return self - end - return c - else - error("Make sure you required the love.thread module!") - end - else - c.linda=lanes.linda() - function c:push(v) - self.linda:send("Q",v) - end - function c:pop() - return ({self.linda:receive(0,"Q")})[2] - end - function c:init() - return self - end - GLOBAL[name]=c - end - return c -end -queue=multi:newSystemThreadedQueue("QUEUE"):init() -queue:push("This is a test") -queue:push("This is a test2") -queue:push("This is a test3") -queue:push("This is a test4") -multi:newSystemThread("test2",function() - queue=sThread.waitFor("QUEUE"):init() - data=queue:pop() - while data do - print(data) - data=queue:pop() - end - queue:push("DONE!") -end) -multi:newThread("test!",function() - thread.hold(function() return queue:pop() end) - t.text="Done!" -end) -t=gui:newTextLabel("no done yet!",0,0,300,100) -t:centerX() -t:centerY() diff --git a/examples/love2d Threading Example/main3.lua b/examples/love2d Threading Example/main3.lua deleted file mode 100644 index c025a66..0000000 --- a/examples/love2d Threading Example/main3.lua +++ /dev/null @@ -1,37 +0,0 @@ -require("core.Library") -GLOBAL,sThread=require("multi.integration.loveManager").init() -- load the love2d version of the lanesManager and requires the entire multi library ---IMPORTANT --- Do not make the above local, this is the one difference that the lanesManager does not have --- If these are local the functions will have the upvalues put into them that do not exist on the threaded side --- You will need to ensure that the function does not refer to any upvalues in its code. It will print an error if it does though --- Also each thread has a .1 second delay! This is used to generate a random values for each thread! -require("core.GuiManager") -gui.ff.Color=Color.Black -queue=multi:newSystemThreadedQueue("QUEUE"):init() -queue:push(1) -queue:push(2) -queue:push(3) -queue:push(4) -queue:push(5) -queue:push(6) -multi:newSystemThread("STHREAD_1",function() - queue=sThread.waitFor("QUEUE"):init() - GLOBAL["QUEUE"]=nil - data=queue:pop() - while data do - print(data) - data=queue:pop() - end -end) -multi:newThread("THREAD_1",function() - while true do - if GLOBAL["QUEUE"]==nil then - t.text="Deleted a Global!" - break - end - thread.skip() -- give cpu time to other processes - end -end) -t=gui:newTextLabel("no done yet!",0,0,300,100) -t:centerX() -t:centerY() diff --git a/examples/love2d Threading Example/main4.lua b/examples/love2d Threading Example/main4.lua deleted file mode 100644 index b12e7a5..0000000 --- a/examples/love2d Threading Example/main4.lua +++ /dev/null @@ -1,19 +0,0 @@ -require("core.Library") -GLOBAL,sThread=require("multi.integration.loveManager").init() -- load the love2d version of the lanesManager and requires the entire multi library -require("core.GuiManager") -gui.ff.Color=Color.Black -test=multi:newSystemThreadedTable("YO"):init() -test["test1"]="lol" -multi:newSystemThread("test",function() - tab=sThread.waitFor("YO"):init() - print(tab["test1"]) - sThread.sleep(3) - tab["test2"]="Whats so funny?" -end) -multi:newThread("test2",function() - print(test:waitFor("test2")) - t.text="DONE!" -end) -t=gui:newTextLabel("no done yet!",0,0,300,100) -t:centerX() -t:centerY() diff --git a/examples/love2d Threading Example/main5.lua b/examples/love2d Threading Example/main5.lua deleted file mode 100644 index d491c6a..0000000 --- a/examples/love2d Threading Example/main5.lua +++ /dev/null @@ -1,32 +0,0 @@ -require("core.Library") -GLOBAL,sThread=require("multi.integration.loveManager").init() -- load the love2d version of the lanesManager and requires the entire multi library -require("core.GuiManager") -gui.ff.Color=Color.Black -jQueue=multi:newSystemThreadedJobQueue() -- this internally creates System threads, We told it to use a maximum of 3 cores at any given time -jQueue:registerJob("TEST_JOB",function(a,s) - math.randomseed(s) - print("testing...") - -- We will push a random # - TEST_JOB2() -- You can call other registered functions as well! - return math.random(0,255) -- send the result to the main thread -end) -jQueue:registerJob("TEST_JOB2",function(a,s) - print("Test Works!") -end) -jQueue:start() -tableOfOrder={} -jQueue.OnJobCompleted(function(JOBID,n) - -- JOBID is the completed job, starts at 1 and counts up by 1. - -- Threads finish at different times so jobids may be returned out of order! Be sure to have a way to order them - tableOfOrder[JOBID]=n -- we order ours by putting them into a table - if #tableOfOrder==10 then - print("We got all of the pieces!") - end -end) -for i=1,10 do -- Job Name of registered function, ... varargs - jQueue:pushJob("TEST_JOB","This is a test!",math.random(1,1000000)) -end -print("I pushed all of the jobs :)") -t=gui:newTextLabel("no done yet!",0,0,300,100) -t:centerX() -t:centerY() diff --git a/examples/love2d Threading Example/main6.lua b/examples/love2d Threading Example/main6.lua deleted file mode 100644 index bd24ca9..0000000 --- a/examples/love2d Threading Example/main6.lua +++ /dev/null @@ -1,14 +0,0 @@ -require("core.Library") -GLOBAL,sThread=require("multi.integration.loveManager").init() -- load the love2d version of the lanesManager and requires the entire multi library -require("core.GuiManager") -gui.ff.Color=Color.Black -cmd=multi:newSystemThreadedExecute("C:/SystemThreadedExecuteTest.lua") -cmd.OnCMDFinished(function(code) - print("Got Code: "..code) -end) -multi:newTLoop(function() - print("...") -end,1) -t=gui:newTextLabel("no done yet!",0,0,300,100) -t:centerX() -t:centerY() diff --git a/examples/love2d Threading Example/main7.lua b/examples/love2d Threading Example/main7.lua deleted file mode 100644 index 8ed71a6..0000000 --- a/examples/love2d Threading Example/main7.lua +++ /dev/null @@ -1,69 +0,0 @@ -require("core.Library") -GLOBAL,sThread=require("multi.integration.loveManager").init() -- load the love2d version of the lanesManager and requires the entire multi library ---IMPORTANT --- Do not make the above local, this is the one difference that the lanesManager does not have --- If these are local the functions will have the upvalues put into them that do not exist on the threaded side --- You will need to ensure that the function does not refer to any upvalues in its code. It will print an error if it does though --- Also each thread has a .1 second delay! This is used to generate a random values for each thread! -require("core.GuiManager") -- allows the use of graphics in the program. -gui.ff.Color=Color.Black -function comma_value(amount) - local formatted = amount - while true do - formatted, k = string.gsub(formatted, "^(-?%d+)(%d%d%d)", '%1,%2') - if (k==0) then - break - end - end - return formatted -end -multi:newSystemThread("test1",function() -- Another difference is that the multi library is already loaded in the threaded enviroment as well as a call to multi:mainloop() - multi:benchMark(sThread.waitFor("Bench"),nil,"Thread 1"):OnBench(function(self,c) GLOBAL["T1"]=c multi:Stop() end) -end) -multi:newSystemThread("test2",function() -- spawns a thread in another lua process - multi:benchMark(sThread.waitFor("Bench"),nil,"Thread 2"):OnBench(function(self,c) GLOBAL["T2"]=c multi:Stop() end) -end) -multi:newSystemThread("test3",function() -- spawns a thread in another lua process - multi:benchMark(sThread.waitFor("Bench"),nil,"Thread 3"):OnBench(function(self,c) GLOBAL["T3"]=c multi:Stop() end) -end) -multi:newSystemThread("test4",function() -- spawns a thread in another lua process - multi:benchMark(sThread.waitFor("Bench"),nil,"Thread 4"):OnBench(function(self,c) GLOBAL["T4"]=c multi:Stop() end) -end) -multi:newSystemThread("test5",function() -- spawns a thread in another lua process - multi:benchMark(sThread.waitFor("Bench"),nil,"Thread 5"):OnBench(function(self,c) GLOBAL["T5"]=c multi:Stop() end) -end) -multi:newSystemThread("test6",function() -- spawns a thread in another lua process - multi:benchMark(sThread.waitFor("Bench"),nil,"Thread 6"):OnBench(function(self,c) GLOBAL["T6"]=c multi:Stop() end) -end) -multi:newSystemThread("Combiner",function() -- spawns a thread in another lua process - function comma_value(amount) - local formatted = amount - while true do - formatted, k = string.gsub(formatted, "^(-?%d+)(%d%d%d)", '%1,%2') - if (k==0) then - break - end - end - return formatted - end - local b=comma_value(tostring(sThread.waitFor("T1")+sThread.waitFor("T2")+sThread.waitFor("T3")+sThread.waitFor("T4")+sThread.waitFor("T5")+sThread.waitFor("T6"))) - GLOBAL["DONE"]=b -end) -multi:newThread("test0",function() - -- sThread.waitFor("DONE") -- lets hold the main thread completely so we don't eat up cpu - -- os.exit() - -- when the main thread is holding there is a chance that error handling on the system threads may not work! - -- instead we can do this - while true do - thread.skip(1) -- allow error handling to take place... Otherwise lets keep the main thread running on the low - -- Before we held just because we could... But this is a game and we need to have logic continue - --sThreadM.sleep(.001) -- Sleeping for .001 is a greeat way to keep cpu usage down. Make sure if you aren't doing work to rest. Abuse the hell out of GLOBAL if you need to :P - if GLOBAL["DONE"] then - t.text="Bench: "..GLOBAL["DONE"] - end - end -end) -GLOBAL["Bench"]=3 -t=gui:newTextLabel("no done yet!",0,0,300,100) -t:centerX() -t:centerY() diff --git a/examples/love2d Threading Example/multi/all.lua b/examples/love2d Threading Example/multi/all.lua deleted file mode 100644 index d14aac6..0000000 --- a/examples/love2d Threading Example/multi/all.lua +++ /dev/null @@ -1 +0,0 @@ -require("multi") diff --git a/examples/love2d Threading Example/multi/compat/backwards[1,5,0].lua b/examples/love2d Threading Example/multi/compat/backwards[1,5,0].lua deleted file mode 100644 index a0f52a8..0000000 --- a/examples/love2d Threading Example/multi/compat/backwards[1,5,0].lua +++ /dev/null @@ -1,305 +0,0 @@ ---[[ -MIT License - -Copyright (c) 2017 Ryan Ward - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -]] -multi.OnObjectCreated(function(obj) - if obj.Type=="loop" then - function obj:Act() - for i=1,#self.func do - self.func[i](self.Parent.clock()-self.Start,self) - end - end - elseif obj.Type=="step" then - function obj:Act() - if self~=nil then - if self.spos==0 then - if self.pos==self.start then - for fe=1,#self.funcS do - self.funcS[fe](self) - end - end - for i=1,#self.func do - self.func[i](self.pos,self) - end - self.pos=self.pos+self.count - if self.pos-self.count==self.endAt then - self:Pause() - for fe=1,#self.funcE do - self.funcE[fe](self) - end - self.pos=self.start - end - end - end - self.spos=self.spos+1 - if self.spos>=self.skip then - self.spos=0 - end - end - elseif obj.Type=="tstep" then - function c:Act() - if self.clock()-self.timer>=self.set then - self:Reset() - if self.pos==self.start then - for fe=1,#self.funcS do - self.funcS[fe](self) - end - end - for i=1,#self.func do - self.func[i](self.pos,self) - end - self.pos=self.pos+self.count - if self.pos-self.count==self.endAt then - self:Pause() - for fe=1,#self.funcE do - self.funcE[fe](self) - end - self.pos=self.start - end - end - end - end -end) -if thread then - function multi:newThreadedLoop(name,func) - local c=self:newTBase() - c.Type='loopThread' - c.Start=os.clock() - if func then - c.func={func} - end - function c:tofile(path) - local m=bin.new() - m:addBlock(self.Type) - m:addBlock(self.func) - m:addBlock(self.Active) - m:tofile(path) - end - function c:Resume() - self.rest=false - end - function c:Pause() - self.rest=true - end - function c:OnLoop(func) - table.insert(self.func,func) - end - c.rest=false - c.updaterate=0 - c.restRate=.75 - multi:newThread(name,function(ref) - while true do - if c.rest then - thread.sleep(c.restRate) - else - for i=1,#c.func do - c.func[i](os.clock()-self.Start,c) - end - thread.sleep(c.updaterate) - end - end - end) - self:create(c) - return c - end - function multi:newThreadedStep(name,start,reset,count,skip) - local c=self:newTBase() - local think=1 - c.Type='stepThread' - c.pos=start or 1 - c.endAt=reset or math.huge - c.skip=skip or 0 - c.spos=0 - c.count=count or 1*think - c.funcE={} - c.funcS={} - c.start=start or 1 - if start~=nil and reset~=nil then - if start>reset then - think=-1 - end - end - function c:tofile(path) - local m=bin.new() - m:addBlock(self.Type) - m:addBlock(self.func) - m:addBlock(self.funcE) - m:addBlock(self.funcS) - m:addBlock({pos=self.pos,endAt=self.endAt,skip=self.skip,spos=self.spos,count=self.count,start=self.start}) - m:addBlock(self.Active) - m:tofile(path) - end - function c:Resume() - self.rest=false - end - function c:Pause() - self.rest=true - end - c.Reset=c.Resume - function c:OnStart(func) - table.insert(self.funcS,func) - end - function c:OnStep(func) - table.insert(self.func,1,func) - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Break() - self.rest=true - end - function c:Update(start,reset,count,skip) - self.start=start or self.start - self.endAt=reset or self.endAt - self.skip=skip or self.skip - self.count=count or self.count - self:Resume() - end - c.updaterate=0 - c.restRate=.1 - multi:newThread(name,function(ref) - while true do - if c.rest then - ref:sleep(c.restRate) - else - if c~=nil then - if c.spos==0 then - if c.pos==c.start then - for fe=1,#c.funcS do - c.funcS[fe](c) - end - end - for i=1,#c.func do - c.func[i](c.pos,c) - end - c.pos=c.pos+c.count - if c.pos-c.count==c.endAt then - c:Pause() - for fe=1,#c.funcE do - c.funcE[fe](c) - end - c.pos=c.start - end - end - end - c.spos=c.spos+1 - if c.spos>=c.skip then - c.spos=0 - end - ref:sleep(c.updaterate) - end - end - end) - self:create(c) - return c - end - function multi:newThreadedTStep(name,start,reset,count,set) - local c=self:newTBase() - local think=1 - c.Type='tstepThread' - c.Priority=self.Priority_Low - c.start=start or 1 - local reset = reset or math.huge - c.endAt=reset - c.pos=start or 1 - c.skip=skip or 0 - c.count=count or 1*think - c.funcE={} - c.timer=os.clock() - c.set=set or 1 - c.funcS={} - function c:Update(start,reset,count,set) - self.start=start or self.start - self.pos=self.start - self.endAt=reset or self.endAt - self.set=set or self.set - self.count=count or self.count or 1 - self.timer=os.clock() - self:Resume() - end - function c:tofile(path) - local m=bin.new() - m:addBlock(self.Type) - m:addBlock(self.func) - m:addBlock(self.funcE) - m:addBlock(self.funcS) - m:addBlock({pos=self.pos,endAt=self.endAt,skip=self.skip,timer=self.timer,count=self.count,start=self.start,set=self.set}) - m:addBlock(self.Active) - m:tofile(path) - end - function c:Resume() - self.rest=false - end - function c:Pause() - self.rest=true - end - function c:OnStart(func) - table.insert(self.funcS,func) - end - function c:OnStep(func) - table.insert(self.func,func) - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Break() - self.Active=nil - end - function c:Reset(n) - if n then self.set=n end - self.timer=os.clock() - self:Resume() - end - c.updaterate=0 - c.restRate=0 - multi:newThread(name,function(ref) - while true do - if c.rest then - thread.sleep(c.restRate) - else - if os.clock()-c.timer>=c.set then - c:Reset() - if c.pos==c.start then - for fe=1,#c.funcS do - c.funcS[fe](c) - end - end - for i=1,#c.func do - c.func[i](c.pos,c) - end - c.pos=c.pos+c.count - if c.pos-c.count==c.endAt then - c:Pause() - for fe=1,#c.funcE do - c.funcE[fe](c) - end - c.pos=c.start - end - end - thread.skip(c.updaterate) - end - end - end) - self:create(c) - return c - end -end diff --git a/examples/love2d Threading Example/multi/compat/love2d.lua b/examples/love2d Threading Example/multi/compat/love2d.lua deleted file mode 100644 index 569cb2b..0000000 --- a/examples/love2d Threading Example/multi/compat/love2d.lua +++ /dev/null @@ -1,36 +0,0 @@ ---[[ -MIT License - -Copyright (c) 2017 Ryan Ward - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -]] -require("multi") -os.sleep=love.timer.sleep -multi.drawF={} -function multi.dManager() - for ii=1,#multi.drawF do - love.graphics.setColor(255,255,255,255) - multi.drawF[ii]() - end -end -function multi:onDraw(func,i) - i=i or 1 - table.insert(self.drawF,i,func) -end diff --git a/examples/love2d Threading Example/multi/init.lua b/examples/love2d Threading Example/multi/init.lua deleted file mode 100644 index b89a995..0000000 --- a/examples/love2d Threading Example/multi/init.lua +++ /dev/null @@ -1,2272 +0,0 @@ ---[[ -MIT License - -Copyright (c) 2017 Ryan Ward - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -]] -require("bin") -if table.unpack then - unpack=table.unpack -end -function table.merge(t1, t2) - for k,v in pairs(t2) do - if type(v) == 'table' then - if type(t1[k] or false) == 'table' then - table.merge(t1[k] or {}, t2[k] or {}) - else - t1[k] = v - end - else - t1[k] = v - end - end - return t1 -end -_print=print -function print(...) - if not __SUPPRESSPRINTS then - _print(...) - end -end -_write=io.write -function io.write(...) - if not __SUPPRESSWRITES then - _write(...) - end -end -multi = {} -multi.Version="1.9.2" -multi._VERSION="1.9.2" -multi.stage='mostly-stable' -multi.__index = multi -multi.Mainloop={} -multi.Tasks={} -multi.Tasks2={} -multi.Garbage={} -multi.ender={} -multi.Children={} -multi.Paused={} -multi.Active=true -multi.fps=60 -multi.Id=-1 -multi.Type='mainprocess' -multi.Rest=0 -multi._type=type -multi.Jobs={} -multi.queue={} -multi.jobUS=2 -multi.clock=os.clock -multi.time=os.time -multi.LinkedPath=multi -multi.isRunning=false -multi.queuefinal=function(self) - self:Destroy() - if self.Parent.Mainloop[#self.Parent.Mainloop] then - if self.Parent.Mainloop[#self.Parent.Mainloop].Type=="alarm" then - self.Parent.Mainloop[#self.Parent.Mainloop]:Reset() - self.Parent.Mainloop[#self.Parent.Mainloop].Active=true - else - self.Parent.Mainloop[#self.Parent.Mainloop]:Resume() - end - else - for i=1,#self.Parent.funcE do - self.Parent.funcE[i](self) - end - self.Parent:Remove() - end -end ---Do not change these ever...Any other number will not work (Unless you are using enablePriority2()) -multi.Priority_Core=1 -multi.Priority_High=4 -multi.Priority_Above_Normal=16 -multi.Priority_Normal=64 -multi.Priority_Below_Normal=256 -multi.Priority_Low=1024 -multi.Priority_Idle=4096 -multi.PList={multi.Priority_Core,multi.Priority_High,multi.Priority_Above_Normal,multi.Priority_Normal,multi.Priority_Below_Normal,multi.Priority_Low,multi.Priority_Idle} -multi.PStep=1 ---^^^^ -multi.PriorityTick=1 -- Between 1,2 and 4 -multi.Priority=multi.Priority_Core -multi.threshold=256 -multi.threstimed=.001 -function multi:setThreshold(n) - self.threshold=n or 120 -end -function multi:setThrestimed(n) - self.threstimed=n or .001 -end -function multi:getLoad() - return multi:newFunction(function(self) - multi.scheduler:Pause() - local sample=#multi.Mainloop - local FFloadtest=0 - multi:benchMark(multi.threstimed):OnBench(function(_,l3) FFloadtest=l3*(1/multi.threstimed) end) - self:hold(function() return FFloadtest~=0 end) - local val=FFloadtest/sample - multi.scheduler:Resume() - if val>multi.threshold then - return 0 - else - return 100-((val/multi.threshold)*100) - end - end)() -end -function multi:setDomainName(name) - self[name]={} -end -function multi:linkDomain(name) - return self[name] -end -function multi:_Pause() - self.Active=false -end -function multi:setPriority(s) - if type(s)==number then - self.Priority=s - elseif type(s)=='string' then - if s:lower()=='core' or s:lower()=='c' then - self.Priority=self.Priority_Core - elseif s:lower()=='high' or s:lower()=='h' then - self.Priority=self.Priority_High - elseif s:lower()=='above' or s:lower()=='an' then - self.Priority=self.Priority_Above_Normal - elseif s:lower()=='normal' or s:lower()=='n' then - self.Priority=self.Priority_Normal - elseif s:lower()=='below' or s:lower()=='bn' then - self.Priority=self.Priority_Below_Normal - elseif s:lower()=='low' or s:lower()=='l' then - self.Priority=self.Priority_Low - elseif s:lower()=='idle' or s:lower()=='i' then - self.Priority=self.Priority_Idle - end - end -end --- System -function os.getOS() - if package.config:sub(1,1)=='\\' then - return 'windows' - else - return 'unix' - end -end -if os.getOS()=='windows' then - function os.sleep(n) - if n > 0 then os.execute('ping -n ' .. tonumber(n+1) .. ' localhost > NUL') end - end -else - function os.sleep(n) - os.execute('sleep ' .. tonumber(n)) - end -end -function multi:getParentProcess() - return self.Mainloop[self.CID] -end -multi.GetParentProcess=multi.getParentProcess -function multi:Stop() - self.Active=false -end -function multi:condition(cond) - if not self.CD then - self:Pause() - self.held=true - self.CD=cond.condition - elseif not(cond.condition()) then - self.held=false - self:Resume() - self.CD=nil - return false - end - self.Parent:Do_Order() - return true -end -multi.Condition=multi.condition -function multi:isHeld() - return self.held -end -multi.important={} -multi.IsHeld=multi.isHeld -function multi.executeFunction(name,...) - if type(_G[name])=='function' then - _G[name](...) - else - print('Error: Not a function') - end -end -function multi:waitFor(obj) - local value=false - self.__waiting=function() - value=true - end - obj:connectFinal(self.__waiting) - self:hold(function() return value end) -end -multi.WaitFor=multi.waitFor -function multi:reboot(r) - local before=collectgarbage('count') - multi.Mainloop={} - multi.Tasks={} - multi.Tasks2={} - multi.Garbage={} - multi.ender={} - multi.Children={} - multi.Paused={} - multi.Active=true - multi.fps=60 - multi.Id=-1 - multi.Type='mainprocess' - multi.Rest=0 - multi._type=type - multi.Jobs={} - multi.queue={} - multi.jobUS=2 - multi.clock=os.clock - multi.time=os.time - multi.LinkedPath=multi - multi.isRunning=false - multi.Priority_Core=1 - multi.Priority_High=4 - multi.Priority_Above_Normal=16 - multi.Priority_Normal=64 - multi.Priority_Below_Normal=256 - multi.Priority_Low=1024 - multi.Priority_Idle=4096 - multi.PList={multi.Priority_Core,multi.Priority_High,multi.Priority_Above_Normal,multi.Priority_Normal,multi.Priority_Below_Normal,multi.Priority_Low,multi.Priority_Idle} - multi.PStep=1 - multi.PriorityTick=1 - multi.Priority=multi.Priority_Core - multi.threshold=256 - multi.threstimed=.001 - if r then - for i,v in pairs(_G) do - if type(i)=='table' then - if i.Parent and i.Id and i.Act then - _G[i]={} - end - end - end - end - collectgarbage() - local after=collectgarbage('count') - print([[Before rebooting total Ram used was ]]..before..[[Kb -After rebooting total Ram used is ]]..after..[[ Kb -A total of ]]..(before-after)..[[Kb was cleaned up]]) -end -function multi:getChildren() - return self.Mainloop -end -function multi:getVersion() - return multi.Version -end -function multi:getPlatform() - if love then - if love.thread then - return "love2d" - end - else - return "lanes" - end -end -function multi:canSystemThread() - return false -end ---Processor -function multi:getError() - if self.error then - return self.error - end -end -function multi:Do_Order() - local Loop=self.Mainloop - _G.ID=0 - for _D=#Loop,1,-1 do - if Loop[_D] then - if Loop[_D].Active then - Loop[_D].Id=_D - self.CID=_D - Loop[_D]:Act() - end - end - end -end -function multi:enablePriority() - function self:Do_Order() - local Loop=self.Mainloop - _G.ID=0 - local PS=self - for _D=#Loop,1,-1 do - for P=1,7 do - if Loop[_D] then - if (PS.PList[P])%Loop[_D].Priority==0 then - if Loop[_D].Active then - Loop[_D].Id=_D - self.CID=_D - Loop[_D]:Act() - end - end - end - end - end - end -end -function multi:enablePriority2() - function self:Do_Order() - local Loop=self.Mainloop - _G.ID=0 - local PS=self - for _D=#Loop,1,-1 do - if Loop[_D] then - if (PS.PStep)%Loop[_D].Priority==0 then - if Loop[_D].Active then - Loop[_D].Id=_D - self.CID=_D - Loop[_D]:Act() - end - end - end - end - PS.PStep=PS.PStep+1 - if PS.PStep>self.Priority_Idle then - PS.PStep=1 - end - end -end -multi.disablePriority=multi.unProtect -function multi:benchMark(sec,p,pt) - local temp=self:newLoop(function(self,t) - if self.clock()-self.init>self.sec then - if pt then - print(pt.." "..self.c.." Steps in "..sec.." second(s)!") - end - self.tt(self.sec,self.c) - self:Destroy() - else - self.c=self.c+1 - end - end) - temp.Priority=p or 1 - function temp:OnBench(func) - self.tt=func - end - self.tt=function() end - temp.sec=sec - temp.init=self.clock() - temp.c=0 - return temp -end -function multi.startFPSMonitior() - if not multi.runFPS then - multi.doFPS(s) - multi.runFPS=true - end -end -function multi.doFPS(s) - multi:benchMark(1):OnBench(doFPS) - if s then - multi.fps=s - end -end ---Helpers -function multi.timer(func,...) - local timer=multi:newTimer() - timer:Start() - args={func(...)} - return timer:Get(),unpack(args) -end -function multi:IsAnActor() - return ({watcher=true,tstep=true,step=true,updater=true,loop=true,alarm=true,event=true})[self.Type] -end -function multi:OnMainConnect(func) - table.insert(self.func,func) -end -function multi:protect() - function self:Do_Order() - local Loop=self.Mainloop - for _D=#Loop,1,-1 do - if Loop[_D]~=nil then - Loop[_D].Id=_D - self.CID=_D - local status, err=pcall(Loop[_D].Act,Loop[_D]) - if err and not(Loop[_D].error) then - Loop[_D].error=err - self.OnError:Fire(Loop[_D],err) - end - end - end - end -end -function multi:unProtect() - local Loop=self.Mainloop - _G.ID=0 - for _D=#Loop,1,-1 do - if Loop[_D] then - if Loop[_D].Active then - Loop[_D].Id=_D - self.CID=_D - Loop[_D]:Act() - end - end - end -end -function multi:reallocate(o,n) - n=n or #o.Mainloop+1 - local int=self.Parent - self:Destroy() - self.Parent=o - table.insert(o.Mainloop,n,self) - self.Active=true -end -multi.Reallocate=multi.Reallocate -function multi:setJobSpeed(n) - self.jobUS=n -end -function multi:hasJobs() - return #self.Jobs>0,#self.Jobs -end -function multi:getJobs() - return #self.Jobs -end -function multi:removeJob(name) - for i=#self.Jobs,1,-1 do - if self.Jobs[i][2]==name then - table.remove(self.Jobs,i) - end - end -end -function multi:FreeMainEvent() - self.func={} -end -function multi:connectFinal(func) - if self.Type=='event' then - self:OnEvent(func) - elseif self.Type=='alarm' then - self:OnRing(func) - elseif self.Type=='step' or self.Type=='tstep' then - self:OnEnd(func) - else - print("Warning!!! "..self.Type.." doesn't contain a Final Connection State! Use "..self.Type..":Break(function) to trigger it's final event!") - self:OnBreak(func) - end -end -multi.ConnectFinal=multi.connectFinal -function multi:Break() - self:Pause() - self.Active=nil - for i=1,#self.ender do - if self.ender[i] then - self.ender[i](self) - end - end -end -function multi:OnBreak(func) - table.insert(self.ender,func) -end -function multi:isPaused() - return not(self.Active) -end -multi.IsPaused=multi.isPaused -function multi:isActive() - return self.Active -end -multi.IsActive=multi.isActive -function multi:getType() - return self.Type -end -multi.GetType=multi.getType -function multi:Sleep(n) - self:hold(n) -end -multi.sleep=multi.Sleep --- Advance Timer stuff -function multi:SetTime(n) - if not n then n=3 end - local c=multi:newBase() - c.Type='timemaster' - c.timer=multi:newTimer() - c.timer:Start() - c.set=n - c.link=self - self._timer=c.timer - function c:Act() - if self.timer:Get()>=self.set then - self.link:Pause() - for i=1,#self.link.funcTM do - self.link.funcTM[i](self.link) - end - self:Destroy() - end - end - return c -end -multi.ResetTime=multi.SetTime -function multi:ResolveTimer(...) - self._timer:Pause() - for i=1,#self.funcTMR do - self.funcTMR[i](self,...) - end - self:Pause() -end -function multi:OnTimedOut(func) - self.funcTM[#self.funcTM+1]=func -end -function multi:OnTimerResolved(func) - self.funcTMR[#self.funcTMR+1]=func -end --- Timer stuff done -function multi:Pause() - if self.Type=='mainprocess' then - print("You cannot pause the main process. Doing so will stop all methods and freeze your program! However if you still want to use multi:_Pause()") - else - self.Active=false - if self.Parent.Mainloop[self.Id]~=nil then - table.remove(self.Parent.Mainloop,self.Id) - table.insert(self.Parent.Paused,self) - self.PId=#self.Parent.Paused - end - end -end -function multi:Resume() - if self.Type=='process' or self.Type=='mainprocess' then - self.Active=true - local c=self:getChildren() - for i=1,#c do - c[i]:Resume() - end - else - if self:isPaused() then - table.remove(self.Parent.Paused,self.PId) - table.insert(self.Parent.Mainloop,self) - self.Id=#self.Parent.Mainloop - self.Active=true - end - end -end -function multi:resurrect() - table.insert(self.Parent.Mainloop,self) - self.Active=true -end -multi.Resurrect=multi.resurrect -function multi:Destroy() - if self.Type=='process' or self.Type=='mainprocess' then - local c=self:getChildren() - for i=1,#c do - self.OnObjectDestroyed:Fire(c[i]) - c[i]:Destroy() - end - else - for i=1,#self.Parent.Mainloop do - if self.Parent.Mainloop[i]==self then - self.Parent.OnObjectDestroyed:Fire(self) - table.remove(self.Parent.Mainloop,i) - break - end - end - self.Active=false - end -end - -function multi:hold(task) - self:Pause() - self.held=true - if type(task)=='number' then - local timer=multi:newTimer() - timer:Start() - while timer:Get()0 then ---~ for i=1,#self.Parent.FC do ---~ self.Parent.FC[i]:Fire(...) ---~ end ---~ end - if self.Parent.protect then - local t=pcall(self.func,...) - if t then - return t - end - else - return self.func(...) - end - end, - Remove=function(self) - for i=1,#self.Link do - if self.Link[i][2]~=nil then - if self.Link[i][2]==self.ID then - table.remove(self.Link,i) - self.remove=function() end - self.Link=nil - self.ID=nil - return true - end - end - end - end, - } - temp.Destroy=temp.Remove - if name then - self.connections[name]=temp - end - return temp - end - c.Connect=c.connect - function c:tofile(path) - local m=bin.new() - m:addBlock(self.Type) - m:addBlock(self.func) - m:tofile(path) - end - return c -end -multi.OnObjectCreated=multi:newConnection() -multi.OnObjectDestroyed=multi:newConnection() -function multi:newJob(func,name) - if not(self.Type=='mainprocess' or self.Type=='process') then error('Can only create an object on multi or an interface obj') return false end - local c = {} - if self.Type=='process' then - setmetatable(c, self.Parent) - else - setmetatable(c, self) - end - c.Active=true - c.func={} - c.Id=0 - c.PId=0 - c.Parent=self - c.Type='job' - c.trigfunc=func or function() end - function c:Act() - self:trigfunc(self) - end - table.insert(self.Jobs,{c,name}) - if self.JobRunner==nil then - self.JobRunner=self:newAlarm(self.jobUS) - self.JobRunner:OnRing(function(self) - if #self.Parent.Jobs>0 then - if self.Parent.Jobs[1] then - self.Parent.Jobs[1][1]:Act() - table.remove(self.Parent.Jobs,1) - end - end - self:Reset(self.Parent.jobUS) - end) - end -end -function multi:newRange() - local selflink=self - local temp={ - getN = function(self) selflink:Do_Order() self.n=self.n+self.c if self.n>self.b then self.Link.held=false self.Link:Resume() return nil end return self.n end, - } - setmetatable(temp,{ - __call=function(self,a,b,c) - self.c=c or 1 - self.n=a-self.c - self.a=a - self.b=b - self.Link=selflink--.Parent.Mainloop[selflink.CID] or - self.Link:Pause() - self.Link.held=true - return function() return self:getN() end - end - }) - self:create(temp) - return temp -end -multi.NewRange=multi.newRange -function multi:newCondition(func) - local c={['condition']=func,Type="condition"} - self:create(c) - return c -end -multi.NewCondition=multi.newCondition -function multi:mainloop() - if not multi.isRunning then - multi.isRunning=true - for i=1,#self.Tasks do - self.Tasks[i](self) - end - rawset(self,'Start',self.clock()) - while self.Active do - self:Do_Order() - end - else - return "Already Running!" - end -end -function multi:protectedMainloop() - multi:protect() - if not multi.isRunning then - multi.isRunning=true - for i=1,#self.Tasks do - self.Tasks[i](self) - end - rawset(self,'Start',self.clock()) - while self.Active do - self:Do_Order() - end - else - return "Already Running!" - end -end -function multi:unprotectedMainloop() - multi:unProtect() - if not multi.isRunning then - multi.isRunning=true - for i=1,#self.Tasks do - self.Tasks[i](self) - end - rawset(self,'Start',self.clock()) - while self.Active do - local Loop=self.Mainloop - _G.ID=0 - for _D=#Loop,1,-1 do - if Loop[_D] then - if Loop[_D].Active then - Loop[_D].Id=_D - self.CID=_D - Loop[_D]:Act() - end - end - end - end - else - return "Already Running!" - end -end -function multi:prioritizedMainloop1() - multi:enablePriority() - if not multi.isRunning then - multi.isRunning=true - for i=1,#self.Tasks do - self.Tasks[i](self) - end - rawset(self,'Start',self.clock()) - while self.Active do - local Loop=self.Mainloop - _G.ID=0 - local PS=self - for _D=#Loop,1,-1 do - if Loop[_D] then - if (PS.PList[PS.PStep])%Loop[_D].Priority==0 then - if Loop[_D].Active then - Loop[_D].Id=_D - self.CID=_D - Loop[_D]:Act() - end - end - end - end - PS.PStep=PS.PStep+1 - if PS.PStep>7 then - PS.PStep=1 - end - end - else - return "Already Running!" - end -end -function multi:prioritizedMainloop2() - multi:enablePriority2() - if not multi.isRunning then - multi.isRunning=true - for i=1,#self.Tasks do - self.Tasks[i](self) - end - rawset(self,'Start',self.clock()) - while self.Active do - local Loop=self.Mainloop - _G.ID=0 - local PS=self - for _D=#Loop,1,-1 do - if Loop[_D] then - if (PS.PStep)%Loop[_D].Priority==0 then - if Loop[_D].Active then - Loop[_D].Id=_D - self.CID=_D - Loop[_D]:Act() - end - end - end - end - PS.PStep=PS.PStep+1 - if PS.PStep>self.Priority_Idle then - PS.PStep=1 - end - end - else - return "Already Running!" - end -end -function multi._tFunc(self,dt) - for i=1,#self.Tasks do - self.Tasks[i](self) - end - if dt then - self.pump=true - end - self.pumpvar=dt - rawset(self,'Start',self.clock()) -end -function multi:uManager(dt) - if self.Active then - self:oneTime(self._tFunc,self,dt) - function self:uManager(dt) - self:Do_Order() - end - self:Do_Order() - end -end ---Core Actors -function multi:newCustomObject(objRef,t) - local c={} - if t=='process' then - c=self:newBase() - if type(objRef)=='table' then - table.merge(c,objRef) - end - if not c.Act then - function c:Act() - -- Empty function - end - end - else - c=objRef or {} - end - if not c.Type then - c.Type='coustomObject' - end - self:create(c) - return c -end -function multi:newEvent(task) - local c=self:newBase() - c.Type='event' - c.Task=task or function() end - function c:Act() - if self.Task(self) then - self:Pause() - for _E=1,#self.func do - self.func[_E](self) - end - end - end - function c:SetTask(func) - self.Task=func - end - function c:OnEvent(func) - table.insert(self.func,func) - end - self:create(c) - return c -end -function multi:newUpdater(skip) - local c=self:newBase() - c.Type='updater' - c.pos=1 - c.skip=skip or 1 - function c:Act() - if self.pos>=self.skip then - self.pos=0 - for i=1,#self.func do - self.func[i](self) - end - end - self.pos=self.pos+1 - end - function c:SetSkip(n) - self.skip=n - end - c.OnUpdate=self.OnMainConnect - self:create(c) - return c -end -function multi:newAlarm(set) - local c=self:newBase() - c.Type='alarm' - c.Priority=self.Priority_Low - c.timer=self:newTimer() - c.set=set or 0 - function c:Act() - if self.timer:Get()>=self.set then - self:Pause() - self.Active=false - for i=1,#self.func do - self.func[i](self) - end - end - end - function c:Resume() - self.Parent.Resume(self) - self.timer:Resume() - end - function c:Reset(n) - if n then self.set=n end - self:Resume() - self.timer:Reset() - end - function c:OnRing(func) - table.insert(self.func,func) - end - function c:Pause() - self.timer:Pause() - self.Parent.Pause(self) - end - self:create(c) - return c -end -function multi:newLoop(func) - local c=self:newBase() - c.Type='loop' - c.Start=self.clock() - if func then - c.func={func} - end - function c:Act() - for i=1,#self.func do - self.func[i](self,self.Parent.clock()-self.Start) - end - end - function c:OnLoop(func) - table.insert(self.func,func) - end - self:create(c) - return c -end -function multi:newFunction(func) - local c={} - c.func=func - mt={ - __index=multi, - __call=function(self,...) if self.Active then return self:func(...) end local t={...} return "PAUSED" end - } - c.Parent=self - function c:Pause() - self.Active=false - end - function c:Resume() - self.Active=true - end - setmetatable(c,mt) - self:create(c) - return c -end -function multi:newStep(start,reset,count,skip) - local c=self:newBase() - think=1 - c.Type='step' - c.pos=start or 1 - c.endAt=reset or math.huge - c.skip=skip or 0 - c.spos=0 - c.count=count or 1*think - c.funcE={} - c.funcS={} - c.start=start or 1 - if start~=nil and reset~=nil then - if start>reset then - think=-1 - end - end - function c:Act() - if self~=nil then - if self.spos==0 then - if self.pos==self.start then - for fe=1,#self.funcS do - self.funcS[fe](self) - end - end - for i=1,#self.func do - self.func[i](self,self.pos) - end - self.pos=self.pos+self.count - if self.pos-self.count==self.endAt then - self:Pause() - for fe=1,#self.funcE do - self.funcE[fe](self) - end - self.pos=self.start - end - end - end - self.spos=self.spos+1 - if self.spos>=self.skip then - self.spos=0 - end - end - c.Reset=c.Resume - function c:OnStart(func) - table.insert(self.funcS,func) - end - function c:OnStep(func) - table.insert(self.func,1,func) - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Break() - self.Active=nil - end - function c:Update(start,reset,count,skip) - self.start=start or self.start - self.endAt=reset or self.endAt - self.skip=skip or self.skip - self.count=count or self.count - self:Resume() - end - self:create(c) - return c -end -function multi:newTask(func) - table.insert(self.Tasks,func) -end -function multi:newTLoop(func,set) - local c=self:newBase() - c.Type='tloop' - c.set=set or 0 - c.timer=self:newTimer() - c.life=0 - if func then - c.func={func} - end - function c:Act() - if self.timer:Get()>=self.set then - self.life=self.life+1 - for i=1,#self.func do - self.func[i](self,self.life) - end - self.timer:Reset() - end - end - function c:Resume() - self.Parent.Resume(self) - self.timer:Resume() - end - function c:Pause() - self.timer:Pause() - self.Parent.Pause(self) - end - function c:OnLoop(func) - table.insert(self.func,func) - end - self:create(c) - return c -end -function multi:newTrigger(func) - local c={} - c.Type='trigger' - c.trigfunc=func or function() end - function c:Fire(...) - self:trigfunc(...) - end - self:create(c) - return c -end -function multi:newTStep(start,reset,count,set) - local c=self:newBase() - think=1 - c.Type='tstep' - c.Priority=self.Priority_Low - c.start=start or 1 - local reset = reset or math.huge - c.endAt=reset - c.pos=start or 1 - c.skip=skip or 0 - c.count=count or 1*think - c.funcE={} - c.timer=self.clock() - c.set=set or 1 - c.funcS={} - function c:Update(start,reset,count,set) - self.start=start or self.start - self.pos=self.start - self.endAt=reset or self.endAt - self.set=set or self.set - self.count=count or self.count or 1 - self.timer=self.clock() - self:Resume() - end - function c:Act() - if self.clock()-self.timer>=self.set then - self:Reset() - if self.pos==self.start then - for fe=1,#self.funcS do - self.funcS[fe](self) - end - end - for i=1,#self.func do - self.func[i](self,self.pos) - end - self.pos=self.pos+self.count - if self.pos-self.count==self.endAt then - self:Pause() - for fe=1,#self.funcE do - self.funcE[fe](self) - end - self.pos=self.start - end - end - end - function c:OnStart(func) - table.insert(self.funcS,func) - end - function c:OnStep(func) - table.insert(self.func,func) - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Break() - self.Active=nil - end - function c:Reset(n) - if n then self.set=n end - self.timer=self.clock() - self:Resume() - end - self:create(c) - return c -end -function multi:newWatcher(namespace,name) - local function WatcherObj(ns,n) - if self.Type=='queue' then - print("Cannot create a watcher on a queue! Creating on 'multi' instead!") - self=multi - end - local c=self:newBase() - c.Type='watcher' - c.ns=ns - c.n=n - c.cv=ns[n] - function c:OnValueChanged(func) - table.insert(self.func,func) - end - function c:Act() - if self.cv~=self.ns[self.n] then - for i=1,#self.func do - self.func[i](self,self.cv,self.ns[self.n]) - end - self.cv=self.ns[self.n] - end - end - self:create(c) - return c - end - if type(namespace)~='table' and type(namespace)=='string' then - return WatcherObj(_G,namespace) - elseif type(namespace)=='table' and (type(name)=='string' or 'number') then - return WatcherObj(namespace,name) - else - print('Warning, invalid arguments! Nothing returned!') - end -end --- Threading stuff -thread={} -multi.GlobalVariables={} -if os.getOS()=="windows" then - thread.__CORES=tonumber(os.getenv("NUMBER_OF_PROCESSORS")) -else - thread.__CORES=tonumber(io.popen("nproc --all"):read("*n")) -end -function thread.sleep(n) - coroutine.yield({"_sleep_",n or 0}) -end -function thread.hold(n) - if n then if n() then return false end end - coroutine.yield({"_hold_",n or function() return true end}) - return true -end -function thread.skip(n) - coroutine.yield({"_skip_",n or 0}) -end -function thread.kill() - coroutine.yield({"_kill_",":)"}) -end -function thread.yeild() - coroutine.yield({"_sleep_",0}) -end -function thread.getCores() - return thread.__CORES -end -function thread.set(name,val) - multi.GlobalVariables[name]=val - return true -end -function thread.get(name) - return multi.GlobalVariables[name] -end -function thread.waitFor(name) - thread.hold(function() return thread.get(name)~=nil end) - return thread.get(name) -end -function thread.testFor(name,val,sym) - thread.hold(function() return thread.get(name)~=nil end) - return thread.get(name) -end -function multi:newTBase(name) - local c = {} - c.name=name - c.Active=true - c.func={} - c.ender={} - c.Id=0 - c.PId=0 - c.Parent=self - c.important={} - c.held=false - c.ToString=multi.ToString - c.ToFile=multi.ToFile - return c -end -function multi:newThread(name,func) - local c={} - c.ref={} - c.Name=name - c.thread=coroutine.create(func) - c.sleep=1 - c.Type="thread" - c.firstRunDone=false - c.timer=multi.scheduler:newTimer() - c.ref.Globals=self:linkDomain("Globals") - function c.ref:send(name,val) - ret=coroutine.yield({Name=name,Value=val}) - self:syncGlobals(ret) - end - function c.ref:get(name) - return self.Globals[name] - end - function c.ref:kill() - err=coroutine.yield({"_kill_"}) - if err then - error("Failed to kill a thread! Exiting...") - end - end - function c.ref:sleep(n) - if type(n)=="function" then - ret=coroutine.yield({"_hold_",n}) - self:syncGlobals(ret) - elseif type(n)=="number" then - n = tonumber(n) or 0 - ret=coroutine.yield({"_sleep_",n}) - self:syncGlobals(ret) - else - error("Invalid Type for sleep!") - end - end - function c.ref:syncGlobals(v) - self.Globals=v - end - table.insert(self:linkDomain("Threads"),c) - if not multi.scheduler:isActive() then - multi.scheduler:Resume() - end -end -multi:setDomainName("Threads") -multi:setDomainName("Globals") -multi.scheduler=multi:newLoop() -multi.scheduler.Type="scheduler" -function multi.scheduler:setStep(n) - self.skip=tonumber(n) or 24 -end -multi.scheduler.skip=0 -multi.scheduler.counter=0 -multi.scheduler.Threads=multi:linkDomain("Threads") -multi.scheduler.Globals=multi:linkDomain("Globals") -multi.scheduler:OnLoop(function(self) - self.counter=self.counter+1 - for i=#self.Threads,1,-1 do - ret={} - if coroutine.status(self.Threads[i].thread)=="dead" then - table.remove(self.Threads,i) - else - if self.Threads[i].timer:Get()>=self.Threads[i].sleep then - if self.Threads[i].firstRunDone==false then - self.Threads[i].firstRunDone=true - self.Threads[i].timer:Start() - _,ret=coroutine.resume(self.Threads[i].thread,self.Threads[i].ref) - else - _,ret=coroutine.resume(self.Threads[i].thread,self.Globals) - end - if _==false then - self.Parent.OnError:Fire(self.Threads[i],ret) - print("Error in thread: <"..self.Threads[i].Name.."> "..ret) - end - if ret==true or ret==false then - print("Thread Ended!!!") - ret={} - end - end - if ret then - if ret[1]=="_kill_" then - table.remove(self.Threads,i) - elseif ret[1]=="_sleep_" then - self.Threads[i].timer:Reset() - self.Threads[i].sleep=ret[2] - elseif ret[1]=="_skip_" then - self.Threads[i].timer:Reset() - self.Threads[i].sleep=math.huge - local event=multi:newEvent(function(evnt) return multi.scheduler.counter>=evnt.counter end) - event.link=self.Threads[i] - event.counter=self.counter+ret[2] - event:OnEvent(function(evnt) - evnt.link.sleep=0 - end) - elseif ret[1]=="_hold_" then - self.Threads[i].timer:Reset() - self.Threads[i].sleep=math.huge - local event=multi:newEvent(ret[2]) - event.link=self.Threads[i] - event:OnEvent(function(evnt) - evnt.link.sleep=0 - end) - elseif ret.Name then - self.Globals[ret.Name]=ret.Value - end - end - end - end -end) -multi.scheduler:Pause() -multi.OnError=multi:newConnection() -function multi:newThreadedAlarm(name,set) - local c=self:newTBase(name) - c.Type='alarmThread' - c.timer=self:newTimer() - c.set=set or 0 - function c:Resume() - self.rest=false - self.timer:Resume() - end - function c:Reset(n) - if n then self.set=n end - self.rest=false - self.timer:Reset(n) - end - function c:OnRing(func) - table.insert(self.func,func) - end - function c:Pause() - self.timer:Pause() - self.rest=true - end - c.rest=false - c.updaterate=multi.Priority_Low -- skips - c.restRate=0 -- secs - multi:newThread(name,function(ref) - while true do - if c.rest then - thread.sleep(c.restRate) -- rest a bit more when a thread is paused - else - if c.timer:Get()>=c.set then - c:Pause() - for i=1,#c.func do - c.func[i](c) - end - end - thread.skip(c.updaterate) -- lets rest a bit - end - end - end) - self:create(c) - return c -end -function multi:newThreadedUpdater(name,skip) - local c=self:newTBase(name) - c.Type='updaterThread' - c.pos=1 - c.skip=skip or 1 - function c:Resume() - self.rest=false - end - function c:Pause() - self.rest=true - end - c.OnUpdate=self.OnMainConnect - c.rest=false - c.updaterate=0 - c.restRate=.75 - multi:newThread(name,function(ref) - while true do - if c.rest then - thread.sleep(c.restRate) -- rest a bit more when a thread is paused - else - for i=1,#c.func do - c.func[i](c) - end - c.pos=c.pos+1 - thread.skip(c.skip) - end - end - end) - self:create(c) - return c -end -function multi:newThreadedTStep(name,start,reset,count,set) - local c=self:newTBase(name) - local think=1 - c.Type='tstepThread' - c.start=start or 1 - local reset = reset or math.huge - c.endAt=reset - c.pos=start or 1 - c.skip=skip or 0 - c.count=count or 1*think - c.funcE={} - c.timer=os.clock() - c.set=set or 1 - c.funcS={} - function c:Update(start,reset,count,set) - self.start=start or self.start - self.pos=self.start - self.endAt=reset or self.endAt - self.set=set or self.set - self.count=count or self.count or 1 - self.timer=os.clock() - self:Resume() - end - function c:Resume() - self.rest=false - end - function c:Pause() - self.rest=true - end - function c:OnStart(func) - table.insert(self.funcS,func) - end - function c:OnStep(func) - table.insert(self.func,func) - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Break() - self.Active=nil - end - function c:Reset(n) - if n then self.set=n end - self.timer=os.clock() - self:Resume() - end - c.updaterate=0--multi.Priority_Low -- skips - c.restRate=0 - multi:newThread(name,function(ref) - while true do - if c.rest then - thread.sleep(c.restRate) -- rest a bit more when a thread is paused - else - if os.clock()-c.timer>=c.set then - c:Reset() - if c.pos==c.start then - for fe=1,#c.funcS do - c.funcS[fe](c) - end - end - for i=1,#c.func do - c.func[i](c,c.pos) - end - c.pos=c.pos+c.count - if c.pos-c.count==c.endAt then - c:Pause() - for fe=1,#c.funcE do - c.funcE[fe](c) - end - c.pos=c.start - end - end - thread.skip(c.updaterate) -- lets rest a bit - end - end - end) - self:create(c) - return c -end -function multi:newThreadedTLoop(name,func,n) - local c=self:newTBase(name) - c.Type='tloopThread' - c.restN=n or 1 - if func then - c.func={func} - end - function c:Resume() - self.rest=false - end - function c:Pause() - self.rest=true - end - function c:OnLoop(func) - table.insert(self.func,func) - end - c.rest=false - c.updaterate=0 - c.restRate=.75 - multi:newThread(name,function(ref) - while true do - if c.rest then - thread.sleep(c.restRate) -- rest a bit more when a thread is paused - else - for i=1,#c.func do - c.func[i](c) - end - thread.sleep(c.restN) -- lets rest a bit - end - end - end) - self:create(c) - return c -end -function multi:newThreadedStep(name,start,reset,count,skip) - local c=self:newTBase(name) - local think=1 - c.Type='stepThread' - c.pos=start or 1 - c.endAt=reset or math.huge - c.skip=skip or 0 - c.spos=0 - c.count=count or 1*think - c.funcE={} - c.funcS={} - c.start=start or 1 - if start~=nil and reset~=nil then - if start>reset then - think=-1 - end - end - function c:Resume() - self.rest=false - end - function c:Pause() - self.rest=true - end - c.Reset=c.Resume - function c:OnStart(func) - table.insert(self.funcS,func) - end - function c:OnStep(func) - table.insert(self.func,1,func) - end - function c:OnEnd(func) - table.insert(self.funcE,func) - end - function c:Break() - self.rest=true - end - function c:Update(start,reset,count,skip) - self.start=start or self.start - self.endAt=reset or self.endAt - self.skip=skip or self.skip - self.count=count or self.count - self:Resume() - end - c.updaterate=0 - c.restRate=.1 - multi:newThread(name,function(ref) - while true do - if c.rest then - ref:sleep(c.restRate) -- rest a bit more when a thread is paused - else - if c~=nil then - if c.spos==0 then - if c.pos==c.start then - for fe=1,#c.funcS do - c.funcS[fe](c) - end - end - for i=1,#c.func do - c.func[i](c,c.pos) - end - c.pos=c.pos+c.count - if c.pos-c.count==c.endAt then - c:Pause() - for fe=1,#c.funcE do - c.funcE[fe](c) - end - c.pos=c.start - end - end - end - c.spos=c.spos+1 - if c.spos>=c.skip then - c.spos=0 - end - ref:sleep(c.updaterate) -- lets rest a bit - end - end - end) - self:create(c) - return c -end -function multi:newThreadedProcess(name) - local c = {} - setmetatable(c, multi) - function c:newBase(ins) - local ct = {} - setmetatable(ct, self.Parent) - ct.Active=true - ct.func={} - ct.ender={} - ct.Id=0 - ct.PId=0 - ct.Act=function() end - ct.Parent=self - ct.held=false - ct.ref=self.ref - table.insert(self.Mainloop,ct) - return ct - end - c.Parent=self - c.Active=true - c.func={} - c.Id=0 - c.Type='process' - c.Mainloop={} - c.Tasks={} - c.Tasks2={} - c.Garbage={} - c.Children={} - c.Paused={} - c.Active=true - c.Id=-1 - c.Rest=0 - c.updaterate=.01 - c.restRate=.1 - c.Jobs={} - c.queue={} - c.jobUS=2 - c.rest=false - function c:getController() - return nil - end - function c:Start() - self.rest=false - end - function c:Resume() - self.rest=false - end - function c:Pause() - self.rest=true - end - function c:Remove() - self.ref:kill() - end - function c:kill() - err=coroutine.yield({"_kill_"}) - if err then - error("Failed to kill a thread! Exiting...") - end - end - function c:sleep(n) - if type(n)=="function" then - ret=coroutine.yield({"_hold_",n}) - elseif type(n)=="number" then - n = tonumber(n) or 0 - ret=coroutine.yield({"_sleep_",n}) - else - error("Invalid Type for sleep!") - end - end - c.hold=c.sleep - multi:newThread(name,function(ref) - while true do - if c.rest then - ref:Sleep(c.restRate) -- rest a bit more when a thread is paused - else - c:uManager() - ref:sleep(c.updaterate) -- lets rest a bit - end - end - end) - return c -end -function multi:newThreadedLoop(name,func) - local c=self:newTBase(name) - c.Type='loopThread' - c.Start=os.clock() - if func then - c.func={func} - end - function c:Resume() - self.rest=false - end - function c:Pause() - self.rest=true - end - function c:OnLoop(func) - table.insert(self.func,func) - end - c.rest=false - c.updaterate=0 - c.restRate=.75 - multi:newThread(name,function(ref) - while true do - if c.rest then - thread.sleep(c.restRate) -- rest a bit more when a thread is paused - else - for i=1,#c.func do - c.func[i](c,os.clock()-self.Start) - end - thread.sleep(c.updaterate) -- lets rest a bit - end - end - end) - self:create(c) - return c -end -function multi:newThreadedEvent(name,task) - local c=self:newTBase(name) - c.Type='eventThread' - c.Task=task or function() end - function c:OnEvent(func) - table.insert(self.func,func) - end - function c:Resume() - self.rest=false - end - function c:Pause() - self.rest=true - end - c.rest=false - c.updaterate=0 - c.restRate=1 - multi:newThread(name,function(ref) - while true do - if c.rest then - ref:sleep(c.restRate) -- rest a bit more when a thread is paused - else - if c.Task(self) then - for _E=1,#c.func do - c.func[_E](c) - end - c:Pause() - end - ref:sleep(c.updaterate) -- lets rest a bit - end - end - end) - self:create(c) - return c -end --- State Saving Stuff -function multi:IngoreObject() - self.Ingore=true -end -multi.scheduler:IngoreObject() -function multi:ToString() - if self.Ingore then return end - local t=self.Type - local data; - print(t) - if t:sub(-6)=="Thread" then - data={ - Type=t, - rest=self.rest, - updaterate=self.updaterest, - restrate=self.restrate, - name=self.name, - func=self.func, - important=self.important, - Active=self.Active, - ender=self.ender, - -- IDK if these need to be present... - -- Id=self.Id, - -- PId=self.PId, - held=self.held, - } - else - data={ - Type=t, - func=self.func, - funcTM=self.funcTM, - funcTMR=self.funcTMR, - important=self.important, - ender=self.ender, - -- IDK if these need to be present... - -- Id=self.Id, - -- PId=self.PId, - held=self.held, - } - end - if t=="eventThread" or t=="event" then - table.merge(data,{ - Task=self.Task, - }) - elseif t=="loopThread" or t=="loop" then - table.merge(data,{ - Start=self.Start, - }) - elseif t=="stepThread" or t=="step" then - table.merge(data,{ - funcE=self.funcE, - funcS=self.funcS, - pos=self.pos, - endAt=self.endAt, - start=self.start, - spos=self.spos, - skip=self.skip, - count=self.count, - }) - elseif t=="tloopThread" then - table.merge(data,{ - restN=self.restN, - }) - elseif t=="tloop" then - table.merge(data,{ - set=self.set, - life=self.life, - }) - elseif t=="tstepThread" or t=="tstep" then - table.merge(data,{ - funcE=self.funcE, - funcS=self.funcS, - pos=self.pos, - endAt=self.endAt, - start=self.start, - spos=self.spos, - skip=self.skip, - count=self.count, - timer=self.timer, - set=self.set, - reset=self.reset, - }) - elseif t=="updaterThread" or t=="updater" then - table.merge(data,{ - pos=self.pos, - skip=self.skip, - }) - elseif t=="alarmThread" or t=="alarm" then - table.merge(data,{ - set=self.set, - }) - elseif t=="watcher" then - print("Currently cannot sterilize a watcher object!") - -- needs testing - -- table.merge(data,{ - -- ns=self.ns, - -- n=self.n, - -- cv=self.cv, - -- }) - elseif t=="timemaster" then - -- Weird stuff is going on here! - -- Need to do some testing - table.merge(data,{ - timer=self.timer, - _timer=self._timer, - set=self.set, - link=self.link, - }) - elseif t=="process" or t=="mainprocess" then - local loop=self.Mainloop - local dat={} - for i=1,#loop do - local ins=loop[i]:ToString() - if ins~=nil then - table.insert(dat,ins) - end - end - local str=bin.new() - str:addBlock({Type=t}) - str:addBlock(#dat,4,"n") - for i=1,#dat do - str:addBlock(#dat[i],4,"n") - str:addBlock(dat[i]) - end - return str.data - end - for i,v in pairs(self.important) do - data[v]=self[v] - end - local str=bin.new() - str:addBlock(data) - return str.data -end -function multi:newFromString(str) - if type(str)=="table" then - if str.Type=="bin" then - str=str.data - end - end - local handle=bin.new(str) - local data=handle:getBlock("t") - local t=data.Type - if t=="mainprocess" then - local objs=handle:getBlock("n",4) - for i=1,objs do - self:newFromString(handle:getBlock("s",(handle:getBlock("n",4)))) - end - return self - elseif t=="process" then - local temp=multi:newProcess() - local objs=handle:getBlock("n",4) - for i=1,objs do - temp:newFromString(handle:getBlock("s",(handle:getBlock("n",4)))) - end - return temp - elseif t=="step" then -- GOOD - local item=self:newStep() - table.merge(item,data) - return item - elseif t=="tstep" then -- GOOD - local item=self:newTStep() - table.merge(item,data) - return item - elseif t=="tloop" then -- GOOD - local item=self:newTLoop() - table.merge(item,data) - return item - elseif t=="event" then -- GOOD - local item=self:newEvent(data.task) - table.merge(item,data) - return item - elseif t=="alarm" then -- GOOD - local item=self:newAlarm() - table.merge(item,data) - return item - elseif t=="watcher" then -- NEEDS TESTING - local item=self:newWatcher() - table.merge(item,data) - return item - elseif t=="updater" then -- GOOD - local item=self:newUpdater() - table.merge(item,data) - return item - elseif t=="loop" then -- GOOD - local item=self:newLoop() - table.merge(item,data) - return item - elseif t=="eventThread" then -- GOOD - local item=self:newThreadedEvent(data.name) - table.merge(item,data) - return item - elseif t=="loopThread" then -- GOOD - local item=self:newThreadedLoop(data.name) - table.merge(item,data) - return item - elseif t=="stepThread" then -- GOOD - local item=self:newThreadedStep(data.name) - table.merge(item,data) - return item - elseif t=="tloopThread" then -- GOOD - local item=self:newThreadedTLoop(data.name,nil,data.restN) - table.merge(item,data) - return item - elseif t=="tstepThread" then -- GOOD - local item=self:newThreadedTStep(data.name) - table.merge(item,data) - return item - elseif t=="updaterThread" then -- GOOD - local item=self:newThreadedUpdater(data.name) - table.merge(item,data) - return item - elseif t=="alarmThread" then -- GOOD - local item=self:newThreadedAlarm(data.name) - table.merge(item,data) - return item - end -end -function multi:Important(varname) - table.insert(important,varname) -end -function multi:ToFile(path) - bin.new(self:ToString()):tofile(path) -end -function multi:fromFile(path) - self:newFromString(bin.load(path)) -end -function multi:SetStateFlag(opt) - -- -end -function multi:quickStateSave(b) - -- -end -function multi:saveState(path,opt) - -- -end -function multi:loadState(path) - -- -end -function multi:setDefualtStateFlag(opt) - -- -end diff --git a/examples/love2d Threading Example/multi/integration/lanesManager.lua b/examples/love2d Threading Example/multi/integration/lanesManager.lua deleted file mode 100644 index 023dd81..0000000 --- a/examples/love2d Threading Example/multi/integration/lanesManager.lua +++ /dev/null @@ -1,146 +0,0 @@ ---[[ -MIT License - -Copyright (c) 2017 Ryan Ward - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -]] -package.path="?/init.lua;?.lua;"..package.path -function os.getOS() - if package.config:sub(1,1)=='\\' then - return 'windows' - else - return 'unix' - end -end --- Step 1 get lanes -lanes=require("lanes").configure() ---~ package.path="lua/?/init.lua;lua/?.lua;"..package.path -require("multi") -- get it all and have it on all lanes -isMainThread=true -function multi:canSystemThread() - return true -end -function multi:getPlatform() - return "lanes" -end -local multi=multi --- Step 2 set up the linda objects -local __GlobalLinda = lanes.linda() -- handles global stuff -local __SleepingLinda = lanes.linda() -- handles sleeping stuff --- For convience a GLOBAL table will be constructed to handle requests -local GLOBAL={} -setmetatable(GLOBAL,{ - __index=function(t,k) - return __GlobalLinda:get(k) - end, - __newindex=function(t,k,v) - __GlobalLinda:set(k,v) - end, -}) --- Step 3 rewrite the thread methods to use lindas -local THREAD={} -function THREAD.set(name,val) - __GlobalLinda:set(name,val) -end -function THREAD.get(name) - __GlobalLinda:get(name) -end -local function randomString(n) - local str = '' - local strings = {'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','1','2','3','4','5','6','7','8','9','0','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'} - for i=1,n do - str = str..''..strings[math.random(1,#strings)] - end - return str -end -function THREAD.waitFor(name) - local function wait() - math.randomseed(os.time()) - __SleepingLinda:receive(.001,randomString(12)) - end - repeat wait() until __GlobalLinda:get(name) - return __GlobalLinda:get(name) -end -function THREAD.testFor(name,val,sym) - -- -end -function THREAD.getCores() - return THREAD.__CORES -end -if os.getOS()=="windows" then - THREAD.__CORES=tonumber(os.getenv("NUMBER_OF_PROCESSORS")) -else - THREAD.__CORES=tonumber(io.popen("nproc --all"):read("*n")) -end -function THREAD.kill() -- trigger the lane destruction - error("Thread was killed!") -end -function THREAD.getName() - return THREAD_NAME -end ---[[ Step 4 We need to get sleeping working to handle timing... We want idle wait, not busy wait -Idle wait keeps the CPU running better where busy wait wastes CPU cycles... Lanes does not have a sleep method -however, a linda recieve will in fact be a idle wait! So we use that and wrap it in a nice package]] -function THREAD.sleep(n) - math.randomseed(os.time()) - __SleepingLinda:receive(n,randomString(12)) -end -function THREAD.hold(n) - local function wait() - math.randomseed(os.time()) - __SleepingLinda:receive(.001,randomString(12)) - end - repeat wait() until n() -end --- Step 5 Basic Threads! -function multi:newSystemThread(name,func,...) - local c={} - local __self=c - c.name=name - c.Type="sthread" - local THREAD_NAME=name - local function func2(...) - _G["THREAD_NAME"]=THREAD_NAME - func() - end - c.thread=lanes.gen("*", func2)(...) - function c:kill() - --self.status:Destroy() - self.thread:cancel() - print("Thread: '"..self.name.."' has been stopped!") - end - c.status=multi:newUpdater(multi.Priority_IDLE) - c.status.link=c - c.status:OnUpdate(function(self) - local v,err,t=self.link.thread:join(.001) - if err then - multi.OnError:Fire(self.link,err) - print("Error in systemThread: '"..self.link.name.."' <"..err..">") - self:Destroy() - end - end) - return c -end -print("Integrated Lanes!") -multi.integration={} -- for module creators -multi.integration.GLOBAL=GLOBAL -multi.integration.THREAD=THREAD -require("multi.integration.shared") -return {init=function() return GLOBAL,THREAD end} diff --git a/examples/love2d Threading Example/multi/integration/loveManager.lua b/examples/love2d Threading Example/multi/integration/loveManager.lua deleted file mode 100644 index 172f8e9..0000000 --- a/examples/love2d Threading Example/multi/integration/loveManager.lua +++ /dev/null @@ -1,361 +0,0 @@ -require("multi.compat.love2d") -function multi:canSystemThread() - return true -end -function multi:getPlatform() - return "love2d" -end -multi.integration={} -multi.integration.love2d={} -multi.integration.love2d.ThreadBase=[[ -tab={...} -__THREADID__=table.remove(tab,1) -__THREADNAME__=table.remove(tab,1) -require("love.filesystem") -require("love.system") -require("love.timer") -require("love.image") -require("multi") -GLOBAL={} -isMainThread=false -setmetatable(GLOBAL,{ - __index=function(t,k) - __sync__() - return __proxy__[k] - end, - __newindex=function(t,k,v) - __sync__() - __proxy__[k]=v - if type(v)=="userdata" then - __MainChan__:push(v) - else - __MainChan__:push("SYNC "..type(v).." "..k.." "..resolveData(v)) - end - end, -}) -function __sync__() - local data=__mythread__:pop() - while data do - love.timer.sleep(.01) - if type(data)=="string" then - local cmd,tp,name,d=data:match("(%S-) (%S-) (%S-) (.+)") - if name=="__DIEPLZ"..__THREADID__.."__" then - error("Thread: "..__THREADID__.." has been stopped!") - end - if cmd=="SYNC" then - __proxy__[name]=resolveType(tp,d) - end - else - __proxy__[name]=data - end - data=__mythread__:pop() - end -end -function ToStr(val, name, skipnewlines, depth) - skipnewlines = skipnewlines or false - depth = depth or 0 - local tmp = string.rep(" ", depth) - if name then - if type(name) == "string" then - tmp = tmp .. "[\""..name.."\"] = " - else - tmp = tmp .. "["..(name or "").."] = " - end - end - if type(val) == "table" then - tmp = tmp .. "{" .. (not skipnewlines and " " or "") - for k, v in pairs(val) do - tmp = tmp .. ToStr(v, k, skipnewlines, depth + 1) .. "," .. (not skipnewlines and " " or "") - end - tmp = tmp .. string.rep(" ", depth) .. "}" - elseif type(val) == "number" then - tmp = tmp .. tostring(val) - elseif type(val) == "string" then - tmp = tmp .. string.format("%q", val) - elseif type(val) == "boolean" then - tmp = tmp .. (val and "true" or "false") - elseif type(val) == "function" then - tmp = tmp .. "loadDump([===["..dump(val).."]===])" - else - tmp = tmp .. "\"[inserializeable datatype:" .. type(val) .. "]\"" - end - return tmp -end -function resolveType(tp,d) - if tp=="number" then - return tonumber(d) - elseif tp=="bool" then - return (d=="true") - elseif tp=="function" then - return loadDump("[==["..d.."]==]") - elseif tp=="table" then - return loadstring("return "..d)() - elseif tp=="nil" then - return nil - else - return d - end -end -function resolveData(v) - local data="" - if type(v)=="table" then - return ToStr(v) - elseif type(v)=="function" then - return dump(v) - elseif type(v)=="string" or type(v)=="number" or type(v)=="bool" or type(v)=="nil" then - return tostring(v) - end - return data -end -sThread={} -local function randomString(n) - local c=os.clock() - local a=0 - while os.clock()" - c.thread=love.thread.newThread(multi.integration.love2d.ThreadBase:gsub("INSERT_USER_CODE",dump(func))) - c.thread:start(c.ID,c.name,...) - function c:kill() - multi.integration.GLOBAL["__DIEPLZ"..self.ID.."__"]="__DIEPLZ"..self.ID.."__" - end - return c -end -function love.threaderror( thread, errorstr ) - multi.OnError:Fire(thread,errorstr) - print("Error in systemThread: "..tostring(thread)..": "..errorstr) -end -local THREAD={} -function THREAD.set(name,val) - GLOBAL[name]=val -end -function THREAD.get(name) - return GLOBAL[name] -end -function THREAD.waitFor(name) - repeat multi:uManager() until GLOBAL[name] - return GLOBAL[name] -end -function THREAD.getCores() - return love.system.getProcessorCount() -end -function THREAD.sleep(n) - love.timer.sleep(n) -end -function THREAD.hold(n) - repeat multi:uManager() until n() -end -__channels__={} -multi.integration.GLOBAL=GLOBAL -multi.integration.THREAD=THREAD -updater=multi:newUpdater() -updater:OnUpdate(function(self) - local data=multi.integration.love2d.mainChannel:pop() - while data do - if type(data)=="string" then - local cmd,tp,name,d=data:match("(%S-) (%S-) (%S-) (.+)") - if cmd=="SYNC" then - __proxy__[name]=resolveType(tp,d) - for i=1,#__channels__ do - -- send data to other threads - if type(v)=="userdata" then - __channels__[i]:push(v) - else - __channels__[i]:push("SYNC "..tp.." "..name.." "..d) - end - end - elseif cmd=="NEWTHREAD" then - __channels__[#__channels__+1]=love.thread.getChannel(tp) - for k,v in pairs(__proxy__) do -- sync the global with each new thread - if type(v)=="userdata" then - __channels__[#__channels__]:push(v) - else - __channels__[#__channels__]:push("SYNC "..type(v).." "..k.." "..resolveData(v)) - end - end - end - else - __proxy__[name]=data - end - data=multi.integration.love2d.mainChannel:pop() - end -end) -require("multi.integration.shared") -print("Integrated Love2d!") -return { - init=function(t) - if t then - if t.threadNamespace then - multi.integration.THREADNAME=t.threadNamespace - multi.integration.love2d.ThreadBase:gsub("sThread",t.threadNamespace) - end - if t.globalNamespace then - multi.integration.GLOBALNAME=t.globalNamespace - multi.integration.love2d.ThreadBase:gsub("GLOBAL",t.globalNamespace) - end - end - return GLOBAL,THREAD - end -} diff --git a/examples/love2d Threading Example/multi/integration/luvitManager.lua b/examples/love2d Threading Example/multi/integration/luvitManager.lua deleted file mode 100644 index ba1e653..0000000 --- a/examples/love2d Threading Example/multi/integration/luvitManager.lua +++ /dev/null @@ -1,127 +0,0 @@ ---[[ -MIT License - -Copyright (c) 2017 Ryan Ward - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -]] - --- I DEMAND USAGE FOR LUVIT --- Cannot use discordia without my multitasking library (Which I love more that the luvit platform... then again i'm partial :P) -package.path="?/init.lua;?.lua;"..package.path -local function _INIT(luvitThread,timer) - -- lots of this stuff should be able to stay the same - function os.getOS() - if package.config:sub(1,1)=='\\' then - return 'windows' - else - return 'unix' - end - end - -- Step 1 get setup threads on luvit... Sigh how do i even... - require("multi") - isMainThread=true - function multi:canSystemThread() - return true - end - function multi:getPlatform() - return "luvit" - end - local multi=multi - -- Step 2 set up the Global table... is this possible? - local GLOBAL={} - setmetatable(GLOBAL,{ - __index=function(t,k) - --print("No Global table when using luvit integration!") - return nil - end, - __newindex=function(t,k,v) - --print("No Global table when using luvit integration!") - end, - }) - local THREAD={} - function THREAD.set(name,val) - --print("No Global table when using luvit integration!") - end - function THREAD.get(name) - --print("No Global table when using luvit integration!") - end - local function randomString(n) - local str = '' - local strings = {'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','1','2','3','4','5','6','7','8','9','0','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'} - for i=1,n do - str = str..''..strings[math.random(1,#strings)] - end - return str - end - function THREAD.waitFor(name) - --print("No Global table when using luvit integration!") - end - function THREAD.testFor(name,val,sym) - --print("No Global table when using luvit integration!") - end - function THREAD.getCores() - return THREAD.__CORES - end - if os.getOS()=="windows" then - THREAD.__CORES=tonumber(os.getenv("NUMBER_OF_PROCESSORS")) - else - THREAD.__CORES=tonumber(io.popen("nproc --all"):read("*n")) - end - function THREAD.kill() -- trigger the thread destruction - error("Thread was Killed!") - end - -- hmmm if im cleaver I can get this to work... but since data passing isn't going to be a thing its probably not important - function THREAD.sleep(n) - --print("No Global table when using luvit integration!") - end - function THREAD.hold(n) - --print("No Global table when using luvit integration!") - end - -- Step 5 Basic Threads! - local function entry(path,name,func,...) - local timer = require'timer' - local luvitThread = require'thread' - package.path=path - loadstring(func)(...) - end - function multi:newSystemThread(name,func,...) - local c={} - local __self=c - c.name=name - c.Type="sthread" - c.thread={} - c.func=string.dump(func) - function c:kill() - -- print("No Global table when using luvit integration!") - end - luvitThread.start(entry,package.path,name,c.func,...) - return c - end - print("Integrated Luvit!") - multi.integration={} -- for module creators - multi.integration.GLOBAL=GLOBAL - multi.integration.THREAD=THREAD - require("multi.integration.shared") - -- Start the main mainloop... This allows you to process your multi objects, but the engine on the main thread will be limited to .001 or 1 millisecond sigh... - local interval = timer.setInterval(1, function () - multi:uManager() - end) -end -return {init=function(threadHandle,timerHandle) _INIT(threadHandle,timerHandle) return GLOBAL,THREAD end} diff --git a/examples/love2d Threading Example/multi/integration/shared.lua b/examples/love2d Threading Example/multi/integration/shared.lua deleted file mode 100644 index 87d850d..0000000 --- a/examples/love2d Threading Example/multi/integration/shared.lua +++ /dev/null @@ -1,519 +0,0 @@ ---[[ -MIT License - -Copyright (c) 2017 Ryan Ward - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -]] -function multi:newSystemThreadedQueue(name) -- in love2d this will spawn a channel on both ends - local c={} -- where we will store our object - c.name=name -- set the name this is important for the love2d side - if love then -- check love - if love.thread then -- make sure we can use the threading module - function c:init() -- create an init function so we can mimic on both love2d and lanes - self.chan=love.thread.getChannel(self.name) -- create channel by the name self.name - function self:push(v) -- push to the channel - local tab - if type(v)=="table" then - tab = {} - for i,c in pairs(v) do - if type(c)=="function" then - tab[i]="\1"..string.dump(c) - else - tab[i]=c - end - end - self.chan:push(tab) - else - self.chan:push(c) - end - end - function self:pop() -- pop from the channel - local v=self.chan:pop() - if not v then return end - if type(v)=="table" then - tab = {} - for i,c in pairs(v) do - if type(c)=="string" then - if c:sub(1,1)=="\1" then - tab[i]=loadstring(c:sub(2,-1)) - else - tab[i]=c - end - else - tab[i]=c - end - end - return tab - else - return self.chan:pop() - end - end - function self:peek() - local v=self.chan:peek() - if not v then return end - if type(v)=="table" then - tab = {} - for i,c in pairs(v) do - if type(c)=="string" then - if c:sub(1,1)=="\1" then - tab[i]=loadstring(c:sub(2,-1)) - else - tab[i]=c - end - else - tab[i]=c - end - end - return tab - else - return self.chan:pop() - end - end - GLOBAL[self.name]=self -- send the object to the thread through the global interface - return self -- return the object - end - return c - else - error("Make sure you required the love.thread module!") -- tell the user if he/she didn't require said module - end - else - c.linda=lanes.linda() -- lanes is a bit easier, create the linda on the main thread - function c:push(v) -- push to the queue - self.linda:send("Q",v) - end - function c:pop() -- pop the queue - return ({self.linda:receive(0,"Q")})[2] - end - function c:peek() - return self.linda:get("Q") - end - function c:init() -- mimic the feature that love2d requires, so code can be consistent - return self - end - multi.integration.GLOBAL[name]=c -- send the object to the thread through the global interface - end - return c -end -function multi:newSystemThreadedConnection(name,protect) - local c={} - c.name = name - c.protect=protect - local sThread=multi.integration.THREAD - local GLOBAL=multi.integration.GLOBAL - function c:init() - require("multi") - if multi:getPlatform()=="love2d" then - GLOBAL=_G.GLOBAL - sThread=_G.sThread - end - local conn = {} - conn.name = self.name - conn.count = 0 - if isMainThread then - if GLOBAL[self.name.."THREADED_CONNQ"] then -- if this thing exists then lets grab it, we are doing something different here. instead of cleaning things up, we will gave a dedicated queue to manage things - conn.queueCall = sThread.waitFor(self.name.."THREADED_CALLQ"):init() - else - conn.queueCall = multi:newSystemThreadedQueue(self.name.."THREADED_CALLQ"):init() - end - else - require("multi") -- so things don't break, but also allows bi-directional connections to work - conn.queueCall = sThread.waitFor(self.name.."THREADED_CALLQ"):init() - end - setmetatable(conn,{__call=function(self,...) return self:connect(...) end}) - conn.obj=multi:newConnection(self.protect) - function conn:connect(func) - return self.obj(func) - end - function conn:fConnect(func) - return self.obj:fConnect(func) - end - function conn:holdUT(n) - self.obj:holdUT(n) - end - function conn:Bind(t) - self.obj:Bind(t) - end - function conn:Remove() - self.obj:Remove() - end - function conn:getConnection(name,ingore) - return self.obj:getConnection(name,ingore) - end - function conn:Fire(...) - local args = {...} - table.insert(args,1,multi.randomString(8)) - table.insert(args,1,self.name) - table.insert(args,1,"F") - self.queueCall:push(args) - if self.trigger_self then - self.obj:Fire(...) - end - end - self.cleanup = .01 - function conn:SetCleanUpRate(n) - self.cleanup=n or .01 - end - conn.lastid="" - conn.looper = multi:newLoop(function(self) - local con = self.link - local data = con.queueCall:peek() - if not data then return end - local id = data[3] - if data[1]=="F" and data[2]==con.name and con.lastid~=id then - con.lastid=id - table.remove(data,1)-- Remove the first 3 elements - table.remove(data,1)-- Remove the first 3 elements - table.remove(data,1)-- Remove the first 3 elements - con.obj:Fire(unpack(data)) - multi:newThread("Clean_UP",function() - thread.sleep(con.cleanup) - local dat = con.queueCall:peek() - if not dat then return end - table.remove(data,1)-- Remove the first 3 elements - table.remove(data,1)-- Remove the first 3 elements - table.remove(data,1)-- Remove the first 3 elements - if dat[3]==id then - con.queueCall:pop() - end - end) - end - end) - conn.HoldUT=conn.holdUT - conn.looper.link=conn - conn.Connect=conn.connect - conn.FConnect=conn.fConnect - conn.GetConnection=conn.getConnection - return conn - end - GLOBAL[name]=c - return c -end -function multi:systemThreadedBenchmark(n,p) - n=n or 1 - local cores=multi.integration.THREAD.getCores() - local queue=multi:newSystemThreadedQueue("QUEUE") - multi.integration.GLOBAL["__SYSTEMBENCHMARK__"]=n - local sThread=multi.integration.THREAD - local GLOBAL=multi.integration.GLOBAL - for i=1,cores do - multi:newSystemThread("STHREAD_BENCH",function() - require("multi") - if multi:getPlatform()=="love2d" then - GLOBAL=_G.GLOBAL - sThread=_G.sThread - end -- we cannot have upvalues... in love2d globals not locals must be used - queue=sThread.waitFor("QUEUE"):init() -- always wait for when looking for a variable at the start of the thread! - multi:benchMark(sThread.waitFor("__SYSTEMBENCHMARK__")):OnBench(function(self,count) - queue:push(count) - multi:Stop() - end) - multi:mainloop() - end) - end - local c={} - c.tt=function() end - c.p=p - function c:OnBench(func) - self.tt=func - end - multi:newThread("THREAD_BENCH",function() - thread.sleep(n+.1) - GLOBAL["QUEUE"]=nil -- time to clean up - local num=0 - data=queue:pop() - while data do - num=num+data - data=queue:pop() - end - if p then - print(tostring(p)..num) - end - c.tt(c,num) - end) - return c -end -function multi:newSystemThreadedConsole(name) - local c={} - c.name = name - local sThread=multi.integration.THREAD - local GLOBAL=multi.integration.GLOBAL - function c:init() - require("multi") - if multi:getPlatform()=="love2d" then - GLOBAL=_G.GLOBAL - sThread=_G.sThread - end - local cc={} - if isMainThread then - if GLOBAL["__SYSTEM_CONSLOE__"] then - cc.stream = sThread.waitFor("__SYSTEM_CONSLOE__"):init() - else - cc.stream = multi:newSystemThreadedQueue("__SYSTEM_CONSLOE__"):init() - multi:newThread("Threaded_Console",function() - while true do - thread.sleep(.001) - local data = cc.stream:pop() - if data then - local dat = table.remove(data,1) - if dat=="w" then - io.write(unpack(data)) - elseif dat=="p" then - print(unpack(data)) - end - end - end - end) - end - else - cc.stream = sThread.waitFor("__SYSTEM_CONSLOE__"):init() - end - function cc:write(msg) - self.stream:push({"w",tostring(msg)}) - end - function cc:print(...) - local tab = {...} - for i=1,#tab do - tab[i]=tostring(tab[i]) - end - self.stream:push({"p",unpack(tab)}) - end - return cc - end - GLOBAL[c.name]=c - return c -end -function multi:newSystemThreadedTable(name) - local c={} - c.name=name -- set the name this is important for identifying what is what - local sThread=multi.integration.THREAD - local GLOBAL=multi.integration.GLOBAL - function c:init() -- create an init function so we can mimic on both love2d and lanes - if multi:getPlatform()=="love2d" then - GLOBAL=_G.GLOBAL - sThread=_G.sThread - end - local cc={} - cc.tab={} - if isMainThread then - cc.conn = multi:newSystemThreadedConnection(self.name.."_Tabled_Connection"):init() - else - cc.conn = sThread.waitFor(self.name.."_Tabled_Connection"):init() - end - function cc:waitFor(name) - repeat multi:uManager() until tab[name]~=nil - return tab[name] - end - local link = cc - cc.conn(function(k,v) - link.tab[k]=v - end) - setmetatable(cc,{ - __index=function(t,k) - return t.tab[k] - end, - __newindex=function(t,k,v) - t.tab[k]=v - t.conn:Fire(k,v) - end, - }) - return cc - end - GLOBAL[c.name]=c - return c -end -function multi:newSystemThreadedJobQueue(numOfCores) - local c={} - c.jobnum=1 - c.cores=numOfCores or multi.integration.THREAD.getCores() - c.queueIN=multi:newSystemThreadedQueue("THREADED_JQ"):init() - c.queueOUT=multi:newSystemThreadedQueue("THREADED_JQO"):init() - c.queueALL=multi:newSystemThreadedQueue("THREADED_QALL"):init() - c.REG=multi:newSystemThreadedQueue("THREADED_JQ_F_REG"):init() - c.OnReady=multi:newConnection() - function c:registerJob(name,func) - for i=1,self.cores do - self.REG:push({name,func}) - end - end - function c:pushJob(name,...) - self.queueOUT:push({self.jobnum,name,...}) - self.jobnum=self.jobnum+1 - return self.jobnum-1 - end - local GLOBAL=multi.integration.GLOBAL -- set up locals in case we are using lanes - local sThread=multi.integration.THREAD -- set up locals in case we are using lanes - function c:doToAll(func) - local TaskName=multi.randomString(16) - for i=1,self.cores do - self.queueALL:push({TaskName,func}) - end - end - function c:start() - multi:newEvent(function() - return self.ThreadsLoaded==true - end):OnEvent(function(evnt) - GLOBAL["THREADED_JQ"]=nil -- remove it - GLOBAL["THREADED_JQO"]=nil -- remove it - GLOBAL["THREADED_JQ_F_REG"]=nil -- remove it - self:doToAll(function() - _G["__started__"]=true - SFunc() - end) - evnt:Destroy() - end) - end - GLOBAL["__JQ_COUNT__"]=c.cores - for i=1,c.cores do - multi:newSystemThread("System Threaded Job Queue Worker Thread #"..i,function(name,ind) - require("multi") - ThreadName=name - __sleep__=.001 - if love then -- lets make sure we don't reference up-values if using love2d - GLOBAL=_G.GLOBAL - sThread=_G.sThread - __sleep__=.1 - end - JQI=sThread.waitFor("THREADED_JQO"):init() -- Grab it - JQO=sThread.waitFor("THREADED_JQ"):init() -- Grab it - REG=sThread.waitFor("THREADED_JQ_F_REG"):init() -- Grab it - QALL=sThread.waitFor("THREADED_QALL"):init() -- Grab it - QALLT={} - FUNCS={} - SFunc=multi:newFunction(function(self) - MainLoop:Pause() - self:hold(.1) - MainLoop:Resume() - self:Pause() - end) - multi:newLoop(function() - local rd=REG:peek() - if rd then - if not FUNCS[rd[1]] then - FUNCS[rd[1]]=rd[2] - rd=nil -- lets clean up - REG:pop() - end - end - local d=QALL:peek() - if d then - if not QALLT[d[1]] then - QALLT[d[1]]=true - d[2]() - d=nil -- lets clean up - QALL:pop() - end - end - end) - setmetatable(_G,{ - __index=function(t,k) - return FUNCS[k] - end - }) - lastjob=os.clock() - MainLoop=multi:newLoop(function(self) - if __started__ then - local job=JQI:pop() - if job then - lastjob=os.clock() - local d=QALL:peek() - if d then - if not QALLT[d[1]] then - QALLT[d[1]]=true - d[2]() - d=nil -- lets clean up - QALL:pop() - end - end - local ID=table.remove(job,1) -- return and remove - local name=table.remove(job,1) -- return and remove - if FUNCS[name] then - JQO:push({ID,FUNCS[name](unpack(job))}) - else - self:hold(function() return FUNCS[name] end) - JQO:push({ID,FUNCS[name](unpack(job))}) - end - end - end - end) - multi:newThread("Idler",function() - while true do - if os.clock()-lastjob>1 then - sThread.sleep(.1) - end - thread.sleep(.001) - end - end) - JQO:push({"_THREADINIT_"}) - if not love then - multi:mainloop() - end - end,"Thread<"..i..">",i) - end - c.OnJobCompleted=multi:newConnection() - c.threadsResponded = 0 - c.updater=multi:newLoop(function(self) - local data=self.link.queueIN:pop() - while data do - if data then - local a=unpack(data) - if a=="_THREADINIT_" then - self.link.threadsResponded=self.link.threadsResponded+1 - if self.link.threadsResponded==self.link.cores then - self.link.ThreadsLoaded=true - self.link.OnReady:Fire() - end - else - self.link.OnJobCompleted:Fire(unpack(data)) - end - end - data=self.link.queueIN:pop() - end - end) - c.updater.link=c - return c -end -function multi:newSystemThreadedExecute(cmd) - local c={} - local GLOBAL=multi.integration.GLOBAL -- set up locals incase we are using lanes - local sThread=multi.integration.THREAD -- set up locals incase we are using lanes - local name="Execute_Thread"..multi.randomString(16) - c.name=name - GLOBAL[name.."CMD"]=cmd - multi:newSystemThread(name,function() - if love then -- lets make sure we don't reference upvalues if using love2d - GLOBAL=_G.GLOBAL - sThread=_G.sThread - name=__THREADNAME__ -- global data same as the name we used in this functions creation - end -- Lanes should take the local upvalues ^^^ - cmd=sThread.waitFor(name.."CMD") - local ret=os.execute(cmd) - GLOBAL[name.."R"]=ret - end) - c.OnCMDFinished=multi:newConnection() - c.looper=multi:newLoop(function(self) - local ret=GLOBAL[self.link.name.."R"] - if ret then - self.link.OnCMDFinished:Fire(ret) - self:Destroy() - end - end) - c.looper.link=c - return c -end diff --git a/examples/network-Master1.lua b/examples/network-Master1.lua deleted file mode 100644 index f27e4b2..0000000 --- a/examples/network-Master1.lua +++ /dev/null @@ -1,54 +0,0 @@ --- set up the package -package.path="?/init.lua;?.lua;"..package.path --- Import the libraries -multi = require("multi") -local GLOBAL, THREAD = require("multi.integration.lanesManager").init() -nGLOBAL = require("multi.integration.networkManager").init() --- Act as a master node -master = multi:newMaster{ - name = "Main", -- the name of the master - --noBroadCast = true, -- if using the node manager, set this to true to save on some cpu cycles - --managerDetails = {"localhost",12345}, -- the details to connect to the node manager (ip,port) -} --- Send to all the nodes that are connected to the master -master.OnError(function(name,err) - print(name.." has encountered an error: "..err) -end) -master.OnNodeConnected(function(name) - print("Lets Go!") - master:newNetworkThread("Thread",function(node) -- spawn a network thread on a node that can execute code and return date - local print = node:getConsole().print -- it is important to define things as local... another thing i could do is fenv to make sure all masters work in a protectd isolated enviroment - multi:newTLoop(function() - print("Yo whats up man!") - error("doing a test") - end,1) - end) - master:execute("RemoteTest",name,1,2,3) -- calls a predefined or registered global method on a node - multi:newThread("waiter",function() - print("Hello!",name) - while true do - thread.sleep(2) - master:pushTo(name,"This is a test 2") - if master.connections["NODE_"..name]==nil then - thread.kill() - end - end - end) -end) -multi:newThread("some-test",function() - local dat = master:pop() - while true do - thread.skip(10) - if dat then - print(dat) - end - dat = master:pop() - end -end,"NODE_TESTNODE") --- Starting the multitasker -settings = { - priority = 0, -- 0, 1 or 2 - protect = true, -} -multi:threadloop(settings) ---multi:mainloop(settings) diff --git a/examples/network-node1.lua b/examples/network-node1.lua deleted file mode 100644 index 8d3b0ca..0000000 --- a/examples/network-node1.lua +++ /dev/null @@ -1,20 +0,0 @@ -package.path="?/init.lua;?.lua;"..package.path -multi = require("multi") -local GLOBAL, THREAD = require("multi.integration.lanesManager").init() -nGLOBAL = require("multi.integration.networkManager").init() -node = multi:newNode{ - crossTalk = false, -- default value, allows nodes to talk to eachother. WIP NOT READY YET! - allowRemoteRegistering = true, -- allows you to register functions from the master on the node, default is false - name = "MASTERPC", -- default value is nil, if nil a random name is generated. Naming nodes are important if you assign each node on a network with a different task - --noBroadCast = true, -- if using the node manager, set this to true to save on some cpu cycles - --managerDetails = {"localhost",12345}, -- connects to the node manager if one exists -} -function RemoteTest(a,b,c) -- a function that we will be executing remotely - print("Yes I work!",a,b,c) -end -settings = { - priority = 0, -- 1 or 2 - stopOnError = true, - protect = true, -- if something goes wrong we will crash hard, but the speed gain is good -} -multi:mainloop(settings) diff --git a/examples/network-nodeManager.lua b/examples/network-nodeManager.lua deleted file mode 100644 index 7d57596..0000000 --- a/examples/network-nodeManager.lua +++ /dev/null @@ -1,12 +0,0 @@ -package.path="?/init.lua;?.lua;"..package.path -multi = require("multi") -local GLOBAL, THREAD = require("multi.integration.lanesManager").init() -nGLOBAL = require("multi.integration.networkManager").init() -multi:nodeManager(12345) -- Host a node manager on port: 12345 -print("Node Manager Running...") -settings = { - priority = 0, -- 1 or 2 - protect = false, -} -multi:mainloop(settings) --- Thats all you need to run the node manager, everything else is done automatically diff --git a/multi/init.lua b/multi/init.lua index 471004a..ba3c7b8 100644 --- a/multi/init.lua +++ b/multi/init.lua @@ -1099,7 +1099,7 @@ function thread:newFunction(func,holdme) if err then return multi.NIL, err elseif rets then - return unpack(rets) + return (rets[1] or multi.NIL),rets[2],rets[3],rets[4],rets[5],rets[6],rets[7] end end) else @@ -1109,11 +1109,11 @@ function thread:newFunction(func,holdme) if err then return nil,err end - return unpack(rets) + return rets[1],rets[2],rets[3],rets[4],rets[5],rets[6],rets[7] end end local t = multi:newThread("TempThread",func,...) - t.OnDeath(function(self,status,...) rets = {...} end) + t.OnDeath(function(self,status,a1,a2,a3,a4,a5,a6,a7) rets = {a1,a2,a3,a4,a5,a6,a7} end) t.OnError(function(self,e) err = e end) if holdme then return wait() @@ -1235,20 +1235,21 @@ function multi.initThreads(justThreads) local r1,r2,r3,r4,r5,r6 local ret,_ local function CheckRets(i) - if ret~=nil and not(threads[i].isError) then - if not threads[i] then return end + if threads[i] and not(threads[i].isError) then if not _ then threads[i].isError = true threads[i].TempRets[1] = ret return end - threads[i].TempRets[1] = ret - threads[i].TempRets[2] = r1 - threads[i].TempRets[3] = r2 - threads[i].TempRets[4] = r3 - threads[i].TempRets[5] = r4 - threads[i].TempRets[6] = r5 - threads[i].TempRets[7] = r6 + if ret or r1 or r2 or r3 or r4 or r5 or r6 then + threads[i].TempRets[1] = ret + threads[i].TempRets[2] = r1 + threads[i].TempRets[3] = r2 + threads[i].TempRets[4] = r3 + threads[i].TempRets[5] = r4 + threads[i].TempRets[6] = r5 + threads[i].TempRets[7] = r6 + end end end local function helper(i) @@ -1300,8 +1301,8 @@ function multi.initThreads(justThreads) threads[i].__ready = false ret = nil end - CheckRets(i) end + CheckRets(i) end multi.scheduler:OnLoop(function(self) for i=#threads,1,-1 do @@ -1322,7 +1323,8 @@ function multi.initThreads(justThreads) threads[i].isError = true end if threads[i] and coroutine.status(threads[i].thread)=="dead" then - threads[i].OnDeath:Fire(threads[i],"ended",unpack(threads[i].TempRets or {})) + local t = threads[i].TempRets or {} + threads[i].OnDeath:Fire(threads[i],"ended",t[1],t[2],t[3],t[4],t[5],t[6],t[7]) multi.setType(threads[i],multi.DestroyedObj) table.remove(threads,i) elseif threads[i] and threads[i].task == "skip" then @@ -1331,7 +1333,7 @@ function multi.initThreads(justThreads) threads[i].task = "" threads[i].__ready = true end - elseif threads[i] and threads[i].task == "hold" then --GOHERE + elseif threads[i] and threads[i].task == "hold" then t0,t1,t2,t3,t4,t5,t6 = threads[i].func() if t0 then if t0==multi.NIL then diff --git a/multitut.lua b/multitut.lua deleted file mode 100644 index 81bdd4e..0000000 --- a/multitut.lua +++ /dev/null @@ -1,15 +0,0 @@ -package.path="?/init.lua;?.lua;"..package.path -local multi = require("multi") ---~ local GLOBAL, THREAD = require("multi.integration.lanesManager").init() ---~ nGLOBAL = require("multi.integration.networkManager").init() - - -local a = 0 -local clock = os.clock -b = clock() -while clock()-b <1 do - a = a +1 -end -print("a: "..a) ---~ multi:benchMark(1,nil,"Bench:") ---~ multi:mainloop() diff --git a/rockspecs/multi-14.2-0.rockspec b/rockspecs/multi-14.2-0.rockspec index a003691..0d5c810 100644 --- a/rockspecs/multi-14.2-0.rockspec +++ b/rockspecs/multi-14.2-0.rockspec @@ -20,7 +20,6 @@ build = { type = "builtin", modules = { ["multi"] = "multi/init.lua", - ["multi.utils"] = "multi/utils.lua", ["multi.compat.love2d"] = "multi/compat/love2d.lua", ["multi.integration.lanesManager"] = "multi/integration/lanesManager/init.lua", ["multi.integration.lanesManager.extensions"] = "multi/integration/lanesManager/extensions.lua", diff --git a/test.lua b/test.lua index af63d80..37f7401 100644 --- a/test.lua +++ b/test.lua @@ -2,9 +2,13 @@ package.path="?.lua;?/init.lua;?.lua;?/?/init.lua;"..package.path multi, thread = require("multi"):init() a=0 func = thread:newFunction(function() - return thread.holdFor(3,function() + print(thread.holdFor(3,function() return a==5 - end) + end)) + print(thread.hold(function() + return multi.NIL,"test" + end)) end,true) -- Tell the code to wait and then return -print(func()) +a,b = func() +print(a,b) multi:lightloop() \ No newline at end of file