diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 9b7c9fd1a0..fa37556d03 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -14,6 +14,12 @@ sm-ssc $NEXTVERSION | 2011???? -------------------------------------------------------------------------------- It depends on who you ask. It could be v1.2.5, it could be v1.3.0, it could even be StepMania 5. +We will wait and see. + +20110405 +-------- +* [ScreenEdit] Allow modifying the #DISPLAYBPM traits in the editor. Look in + Edit Song Info to find it. [Wolfman2000] 20110402 -------- diff --git a/Docs/CourseFormat.txt b/Docs/CourseFormat.txt new file mode 100644 index 0000000000..b23aee8e63 --- /dev/null +++ b/Docs/CourseFormat.txt @@ -0,0 +1,83 @@ +Complete Course Template + +[[ Header Content ]] +-- Header Content is comprimised with any course-defining data such as the +-- title, banner and other parameters. +#COURSE:My Course!; +-- The title of the course. +#COURSETRANSLIT:My Course, Translated!; +-- The title of the course, translated into english. +#REPEAT:YES; +-- If this is present, the course does not end. Useful for endless & workout +-- courses. +#LIVES:4; +-- The maximum(?) number of lives attainable in the course. Enabling this will +-- automatically force your course into an Oni course. +#BANNER:My Banner.png; +-- A banner for your course. +#BACKGROUND:My Background.png; +-- A background for your course. Currently only available in SM-SSC. +#STYLE:SINGLE,VERSUS; +-- Denote which styles may be played on this course. This is useful in +-- particular to clone courses for doubles and single courses. +#METER:Beginner:3; +-- A custom-set meter for that course difficulty. You may set the difficulty +-- for Beginner, Easy, Medium, Hard, Challenge and Edit difficulties. + +[[ Song Content ]] +-- Song Content is comprimised with any song-changing data such as modifiers, +-- followed by an actual song for teh game to play. + +-- Modifiers can be assigned in a variety of formats, the most effective three being the following: + +1.) Repeated Modifier Block w/ Length: +#MODS:TIME:0.500:LEN:0.500:MODS:2x; +#MODS:TIME:1.500:LEN:0.500:MODS:0.5x; + +2.) Nested Modifier Block w/ Length: +#MODS: + TIME:0.500:LEN:0.500:MODS:2x; + TIME:1.500:LEN:0.500:MODS:0.5x; + +3.) Nested Modifier Block w/ Ends: +#MODS: + TIME:0.500:END:1.000:MODS:2x; + TIME:1.500:END:1.500:MODS:0.5x; + +#SONG:*:Medium:2x; +-- #SONG can take quite a variety of parameters, of which may be useful to you +-- for testing or randomocity purpose. +-- * is a wildcard item, meaning that StepMania will always pick a random song +-- for this part of the course. +-- You can also replace with BEST*,WORST*,GRADEBEST*, or GRADEWORST*, where * +-- is a number to retrive the first of each category above. +#SONG:BEST1:Medium:2x; +-- As well as that, you may also do Group Random, like such: +#SONG:Dance Dance Revolution 8th Mix/*:Medium:2x; +-- If the above is not applicable, StepMania will search for the song title as best it can, depending on what you give it: +#SONG:Xepher:Medium:2x; +-- Will simply search the title of the song. +#SONG:DDR Supernova/Xepher:Medium:2x; +-- Will search for the exact directory. + +-- #SONG can also apply different effects on each entry in the course by adding +-- special modifiers to the modifiers segment: +#SONG:*:Medium:showcourse; +-- For example, forces the course to never be hidden, noshowcourse being the +-- reverse of such. +-- nodifficult also exists to disable a player from changing difficulties, +-- barring the player from making it easier or harder ( Gauntlets & Survivals +-- do not allow you to change difficulties ). +-- Finally, award*, where * is a number, allows you to control how many lives +-- the player gains from successfully completing a course in Oni mode. + +Finally, here's an example course: +#COURSE:My Awesome Course - The Revenge; +#METER:Medium:8; + +#MODS: + TIME:1.00:END:50.00:MODS:C150; +#SONG:In The Groove/Dawn:Overhead; +#SONG:In The Groove/Mouth:; +#SONG:In The Groove 2/Funk Factory:; +#SONG:In The Groove 3/Disconnected Zeo:; \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/Down Hold Body Active (doubleres).png b/NoteSkins/dance/midi-note-3d/Down Hold Body Active (doubleres).png new file mode 100644 index 0000000000..5a5c758c47 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Hold Body Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Hold Body Inactive (doubleres).png b/NoteSkins/dance/midi-note-3d/Down Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..890e85577f Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Hold BottomCap Active (doubleres).png b/NoteSkins/dance/midi-note-3d/Down Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..c48bca4137 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Hold BottomCap Inactive (doubleres).png b/NoteSkins/dance/midi-note-3d/Down Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..268a08ead1 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Hold Explosion.redir b/NoteSkins/dance/midi-note-3d/Down Hold Explosion.redir new file mode 100644 index 0000000000..9bef57edb4 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/Down Hold Explosion.redir @@ -0,0 +1 @@ +Down Tap Explosion Bright \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/Down Hold Head Active.png b/NoteSkins/dance/midi-note-3d/Down Hold Head Active.png new file mode 100644 index 0000000000..37b14d3586 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Hold Head Active.png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Hold Head Inactive.lua b/NoteSkins/dance/midi-note-3d/Down Hold Head Inactive.lua new file mode 100644 index 0000000000..ce2f8a5c79 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/Down Hold Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('Down','Hold Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/Down Receptor.lua b/NoteSkins/dance/midi-note-3d/Down Receptor.lua new file mode 100644 index 0000000000..cb2ef38198 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/Down Receptor.lua @@ -0,0 +1,26 @@ +local t = Def.ActorFrame { + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap Receptor' ); + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap Receptor' ); + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorArrowOverlay', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrowOverlay', 'NoneCommand'); + }; + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap Flash' ); + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'InitCommand'); + PressCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'PressCommand'); + LiftCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'LiftCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; +}; +return t; diff --git a/NoteSkins/dance/midi-note-3d/Down Roll Body Active (doubleres).png b/NoteSkins/dance/midi-note-3d/Down Roll Body Active (doubleres).png new file mode 100644 index 0000000000..a412335424 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Roll Body Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Roll Body Inactive (doubleres).png b/NoteSkins/dance/midi-note-3d/Down Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..7d995a73ed Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Roll BottomCap Active (doubleres).png b/NoteSkins/dance/midi-note-3d/Down Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..7eeb31774e Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Roll BottomCap Inactive (doubleres).png b/NoteSkins/dance/midi-note-3d/Down Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..25be6edce3 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Roll BottomCap.png b/NoteSkins/dance/midi-note-3d/Down Roll BottomCap.png new file mode 100644 index 0000000000..b4d0918613 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Roll BottomCap.png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Roll Explosion.redir b/NoteSkins/dance/midi-note-3d/Down Roll Explosion.redir new file mode 100644 index 0000000000..9bef57edb4 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/Down Roll Explosion.redir @@ -0,0 +1 @@ +Down Tap Explosion Bright \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/Down Roll Head Active.png b/NoteSkins/dance/midi-note-3d/Down Roll Head Active.png new file mode 100644 index 0000000000..dba93001df Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Roll Head Active.png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Roll Head Inactive.lua b/NoteSkins/dance/midi-note-3d/Down Roll Head Inactive.lua new file mode 100644 index 0000000000..bceb68c82a --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/Down Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('Down','Roll Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/Down Tap Explosion Bright.png b/NoteSkins/dance/midi-note-3d/Down Tap Explosion Bright.png new file mode 100644 index 0000000000..bd54411afb Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Tap Explosion Bright.png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Tap Explosion Dim.redir b/NoteSkins/dance/midi-note-3d/Down Tap Explosion Dim.redir new file mode 100644 index 0000000000..9bef57edb4 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/Down Tap Explosion Dim.redir @@ -0,0 +1 @@ +Down Tap Explosion Bright \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/Down Tap Fake (doubleres).png b/NoteSkins/dance/midi-note-3d/Down Tap Fake (doubleres).png new file mode 100644 index 0000000000..741e7ad279 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Tap Fake (doubleres).png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Tap Lift.png b/NoteSkins/dance/midi-note-3d/Down Tap Lift.png new file mode 100644 index 0000000000..8919b8a664 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Down Tap Lift.png differ diff --git a/NoteSkins/dance/midi-note-3d/Down Tap Mine.lua b/NoteSkins/dance/midi-note-3d/Down Tap Mine.lua new file mode 100644 index 0000000000..ae8d8bd24c --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/Down Tap Mine.lua @@ -0,0 +1,9 @@ +local t = Def.ActorFrame { + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap mine' ); + Frame0000=0; + Delay0000=1; + InitCommand=cmd(spin;effectclock,'beat';effectmagnitude,0,0,-180); + }; +}; +return t; diff --git a/NoteSkins/dance/midi-note-3d/Down Tap Note.lua b/NoteSkins/dance/midi-note-3d/Down Tap Note.lua new file mode 100644 index 0000000000..23d4dc0157 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/Down Tap Note.lua @@ -0,0 +1,7 @@ +local t = Def.Model { + Meshes=NOTESKIN:GetPath('_down','tap note meshes'); + Materials=NOTESKIN:GetPath('_down','tap note materials'); + Bones=NOTESKIN:GetPath('_down','tap bones'); +}; + +return t; diff --git a/NoteSkins/dance/midi-note-3d/Left Hold BottomCap Active.png b/NoteSkins/dance/midi-note-3d/Left Hold BottomCap Active.png new file mode 100644 index 0000000000..9dc1c72578 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Left Hold BottomCap Active.png differ diff --git a/NoteSkins/dance/midi-note-3d/Left Hold BottomCap Inactive.lua b/NoteSkins/dance/midi-note-3d/Left Hold BottomCap Inactive.lua new file mode 100644 index 0000000000..69bb142e52 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/Left Hold BottomCap Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('Left','Hold BottomCap Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,0.5")); +}; \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/Left Roll BottomCap Active.png b/NoteSkins/dance/midi-note-3d/Left Roll BottomCap Active.png new file mode 100644 index 0000000000..2c768bf44f Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Left Roll BottomCap Active.png differ diff --git a/NoteSkins/dance/midi-note-3d/Left Roll BottomCap Inactive.lua b/NoteSkins/dance/midi-note-3d/Left Roll BottomCap Inactive.lua new file mode 100644 index 0000000000..16238c09b5 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/Left Roll BottomCap Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('Left','Roll BottomCap Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,0.5")); +}; \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/NoteSkin.lua b/NoteSkins/dance/midi-note-3d/NoteSkin.lua new file mode 100644 index 0000000000..2f97fb4e72 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/NoteSkin.lua @@ -0,0 +1,128 @@ +-- Haggen Daze + +local ret = ... or {}; + +ret.RedirTable = +{ + Up = "Down", + Down = "Down", + Left = "Down", + Right = "Down", + UpLeft = "Down", + UpRight = "Down", +}; + +local OldRedir = ret.Redir; +ret.Redir = function(sButton, sElement) + -- sButton, sElement = OldRedir(sButton, sElement); + + -- Instead of separate hold heads, use the tap note graphics. + if sElement == "Hold Head Active" or + sElement == "Roll Head Active" + then + sElement = "StreamHead Active"; + end + + -- Test + if sElement == "Hold Head Inactive" or + sElement == "Roll Head Inactive" or + then + sElement = "StreamHead Inactive"; + end + + sButton = ret.RedirTable[sButton]; + + return sButton, sElement; +end + +-- local OldRedir = ret.Redir; +-- ret.Redir = function(sButton, sElement) + -- sButton = ret.RedirTable[sButton]; + -- return sButton, sElement; +-- end + +-- To have separate graphics for each hold part: +local OldRedir = ret.Redir; +ret.Redir = function(sButton, sElement) + -- Redirect non-hold, non-roll parts. + if string.find(sElement, "hold") or string.find(sElement, "roll") then + return sButton, sElement; + end + return OldRedir(sButton, sElement); +end + +--[[ +local OldFunc = ret.Load; +function ret.Load() + local t = OldFunc(); + + -- The main "Explosion" part just loads other actors; don't rotate + -- it. The "Hold Explosion" part should not be rotated. + if Var "Element" == "Explosion" or + Var "Element" == "Roll Explosion" then + t.BaseRotationZ = nil; + end + return t; +end +]] + +local OldFunc = ret.Load; +function ret.Load() + local t = OldFunc(); + + --Explosion should not be rotated; it calls other actors. + if Var "Element" == "Explosion" then + t.BaseRotationZ = nil; + end + return t; +end + +ret.PartsToRotate = +{ + ["Receptor"] = true, + ["Go Receptor"] = true, + ["Ready Receptor"] = true, + ["Tap Explosion Bright"] = true, + ["Tap Explosion Dim"] = true, + ["Tap Note"] = true, + ["Tap Lift"] = true, + ["Hold Head Active"] = true, + ["Hold Head Inactive"] = true, + ["Roll Head Active"] = true, + ["Roll Head Inactive"] = true, + ["Hold Explosion"] = true, + ["Roll Explosion"] = true, +}; +ret.Rotate = +{ + Up = 180, + Down = 0, + Left = 90, + Right = -90, + UpLeft = 135, + UpRight = 225, +}; + +-- +-- If a derived skin wants to have separate UpLeft graphics, +-- use this: +-- +-- ret.RedirTable.UpLeft = "UpLeft"; +-- ret.RedirTable.UpRight = "UpLeft"; +-- ret.Rotate.UpLeft = 0; +-- ret.Rotate.UpRight = 90; +-- +ret.Blank = +{ + ["Hold Topcap Active"] = true, + ["Hold Topcap Inactive"] = true, + ["Roll Topcap Active"] = true, + ["Roll Topcap Inactive"] = true, + ["Hold Tail Active"] = true, + ["Hold Tail Inactive"] = true, + ["Roll Tail Active"] = true, + ["Roll Tail Inactive"] = true, + ["Roll Explosion"] = true, +}; + +return ret; diff --git a/NoteSkins/dance/midi-note-3d/Up Hold BottomCap Active.png b/NoteSkins/dance/midi-note-3d/Up Hold BottomCap Active.png new file mode 100644 index 0000000000..0e4e631058 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Up Hold BottomCap Active.png differ diff --git a/NoteSkins/dance/midi-note-3d/Up Hold BottomCap Inactive.lua b/NoteSkins/dance/midi-note-3d/Up Hold BottomCap Inactive.lua new file mode 100644 index 0000000000..1c2efe09ab --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/Up Hold BottomCap Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('Up','Hold BottomCap Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,0.5")); +}; \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/Up Roll BottomCap Active.png b/NoteSkins/dance/midi-note-3d/Up Roll BottomCap Active.png new file mode 100644 index 0000000000..be4e8864c9 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/Up Roll BottomCap Active.png differ diff --git a/NoteSkins/dance/midi-note-3d/Up Roll BottomCap Inactive.lua b/NoteSkins/dance/midi-note-3d/Up Roll BottomCap Inactive.lua new file mode 100644 index 0000000000..857066f572 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/Up Roll BottomCap Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('Up','Roll BottomCap Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,0.5")); +}; \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/_Down Tap Flash.png b/NoteSkins/dance/midi-note-3d/_Down Tap Flash.png new file mode 100644 index 0000000000..5055d59771 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/_Down Tap Flash.png differ diff --git a/NoteSkins/dance/midi-note-3d/_Down Tap Mine.png b/NoteSkins/dance/midi-note-3d/_Down Tap Mine.png new file mode 100644 index 0000000000..53e4a6d966 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/_Down Tap Mine.png differ diff --git a/NoteSkins/dance/midi-note-3d/_Down Tap Receptor (doubleres).png b/NoteSkins/dance/midi-note-3d/_Down Tap Receptor (doubleres).png new file mode 100644 index 0000000000..91b4f6ed29 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/_Down Tap Receptor (doubleres).png differ diff --git a/NoteSkins/dance/midi-note-3d/_down Tap Note materials.txt b/NoteSkins/dance/midi-note-3d/_down Tap Note materials.txt new file mode 100644 index 0000000000..f3cdd5db2f --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/_down Tap Note materials.txt @@ -0,0 +1,28 @@ +Materials: 3 +"cells" +0.588235 0.588235 0.588235 1.000000 +0.588235 0.588235 0.588235 1.000000 +0.898039 0.898039 0.898039 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"tex\black.png" +"" +"1 - Default" +0.588235 0.588235 0.588235 1.000000 +0.588235 0.588235 0.588235 1.000000 +0.898039 0.898039 0.898039 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"tex\color.ini" +"" +"2 - Inside" +0.588235 0.588235 0.588235 1.000000 +0.588235 0.588235 0.588235 1.000000 +0.898039 0.898039 0.898039 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"tex\color in.jpg" +"" diff --git a/NoteSkins/dance/midi-note-3d/_down tap bones.txt b/NoteSkins/dance/midi-note-3d/_down tap bones.txt new file mode 100644 index 0000000000..fb2c53c800 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/_down tap bones.txt @@ -0,0 +1 @@ +Bones: 0 diff --git a/NoteSkins/dance/midi-note-3d/_down tap note meshes.txt b/NoteSkins/dance/midi-note-3d/_down tap note meshes.txt new file mode 100644 index 0000000000..5f3d35a743 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/_down tap note meshes.txt @@ -0,0 +1,949 @@ +// MilkShape 3D ASCII + +Frames: 30 +Frame: 1 + +Meshes: 3 +"cell" 0 0 +64 +0 2.549132 27.005108 -5.999992 0.000000 0.000000 -1 +0 -2.470720 27.005108 -5.999992 0.000000 0.000000 -1 +0 -3.501126 29.003641 -3.999992 0.000000 0.000000 -1 +0 3.515003 29.000792 -3.999992 0.000000 0.000000 -1 +0 7.480893 22.005108 -5.999992 0.000000 0.000000 -1 +0 9.515003 22.992289 -3.999992 0.000000 0.000000 -1 +0 7.487095 -0.006020 -5.999992 0.000000 0.000000 -1 +0 9.498875 3.988278 -3.999992 0.000000 0.000000 -1 +0 -7.464517 22.005112 -5.999992 0.000000 0.000000 -1 +0 -9.501126 22.993713 -3.999992 0.000000 0.000000 -1 +0 -7.470722 0.000184 -5.999992 0.000000 0.000000 -1 +0 -9.496346 5.006423 -3.999992 0.000000 0.000000 -1 +0 -16.489040 12.002391 -3.999992 0.000000 0.000000 -1 +0 -17.519123 9.995950 -5.999992 0.000000 0.000000 -1 +0 -23.502296 9.990573 -5.999992 0.000000 0.000000 -1 +0 -24.496029 11.991723 -3.999992 0.000000 0.000000 -1 +0 -27.479452 5.977798 -5.999992 0.000000 0.000000 -1 +0 -29.504972 7.003297 -3.999992 0.000000 0.000000 -1 +0 -27.479452 0.022464 -5.999992 0.000000 0.000000 -1 +0 -29.490093 -1.017060 -3.999992 0.000000 0.000000 -1 +0 -0.491594 -27.002575 -5.999992 0.000000 0.000000 -1 +0 -0.502999 -29.987505 -3.999992 0.000000 0.000000 -1 +0 0.540664 -26.992649 -5.999992 0.000000 0.000000 -1 +0 0.530027 -29.987507 -3.999992 0.000000 0.000000 -1 +0 29.517078 -0.995554 -3.999992 0.000000 0.000000 -1 +0 27.495455 -0.000695 -5.999992 0.000000 0.000000 -1 +0 27.501657 5.992133 -5.999992 0.000000 0.000000 -1 +0 29.517847 6.998812 -3.999992 0.000000 0.000000 -1 +0 24.519735 12.004406 -3.999992 0.000000 0.000000 -1 +0 23.485622 10.001644 -5.999992 0.000000 0.000000 -1 +0 17.513138 10.005877 -5.999992 0.000000 0.000000 -1 +0 16.503641 11.993057 -3.999992 0.000000 0.000000 -1 +0 -3.501126 29.003641 3.999992 0.000000 0.000000 -1 +0 -2.470720 27.005108 5.999992 0.000000 0.000000 -1 +0 2.549132 27.005108 5.999992 0.000000 0.000000 -1 +0 3.515003 29.000792 3.999992 0.000000 0.000000 -1 +0 7.480893 22.005108 5.999992 0.000000 0.000000 -1 +0 9.515003 22.992289 3.999992 0.000000 0.000000 -1 +0 7.487095 -0.006020 5.999992 0.000000 0.000000 -1 +0 9.498875 3.988278 3.999992 0.000000 0.000000 -1 +0 -7.464517 22.005112 5.999992 0.000000 0.000000 -1 +0 -9.501126 22.993713 3.999992 0.000000 0.000000 -1 +0 -7.470722 0.000184 5.999992 0.000000 0.000000 -1 +0 -9.496346 5.006423 3.999992 0.000000 0.000000 -1 +0 -16.489040 12.002391 3.999992 0.000000 0.000000 -1 +0 -17.519123 9.995950 5.999992 0.000000 0.000000 -1 +0 -23.502296 9.990573 5.999992 0.000000 0.000000 -1 +0 -24.496029 11.991723 3.999992 0.000000 0.000000 -1 +0 -27.479452 5.977798 5.999992 0.000000 0.000000 -1 +0 -29.504972 7.003297 3.999992 0.000000 0.000000 -1 +0 -27.479452 0.022464 5.999992 0.000000 0.000000 -1 +0 -29.490093 -1.017060 3.999992 0.000000 0.000000 -1 +0 -0.491594 -27.002575 5.999992 0.000000 0.000000 -1 +0 -0.502999 -29.981012 3.999992 0.000000 0.000000 -1 +0 0.540664 -26.992649 5.999992 0.000000 0.000000 -1 +0 0.530027 -29.981014 3.999992 0.000000 0.000000 -1 +0 29.517078 -0.995554 3.999992 0.000000 0.000000 -1 +0 27.495455 -0.000695 5.999992 0.000000 0.000000 -1 +0 27.501657 5.992133 5.999992 0.000000 0.000000 -1 +0 29.517847 6.998812 3.999992 0.000000 0.000000 -1 +0 24.519735 12.004406 3.999992 0.000000 0.000000 -1 +0 23.485622 10.001644 5.999992 0.000000 0.000000 -1 +0 17.513138 10.005877 5.999992 0.000000 0.000000 -1 +0 16.503641 11.993057 3.999992 0.000000 0.000000 -1 +64 +0.169806 0.655192 -0.736131 +-0.250549 0.617210 -0.745840 +-0.275250 0.836959 -0.473009 +0.459405 0.785493 -0.414666 +0.577221 0.333428 -0.745414 +0.881916 0.227749 -0.412741 +0.092722 0.371508 -0.923788 +0.169860 0.707114 -0.686394 +-0.573749 0.332170 -0.748649 +-0.879427 0.314309 -0.357516 +-0.141921 0.315683 -0.938191 +-0.262755 0.616506 -0.742213 +0.344982 0.840986 -0.416810 +0.248845 0.616689 -0.746840 +-0.168686 0.653382 -0.737995 +-0.385134 0.776941 -0.498031 +-0.575127 0.332429 -0.747475 +-0.879422 0.314342 -0.357500 +-0.650095 -0.165820 -0.741539 +-0.785052 -0.458118 -0.416920 +-0.329746 -0.522471 -0.786315 +-0.234369 -0.850153 -0.471498 +0.251898 -0.537389 -0.804835 +0.353500 -0.814060 -0.460808 +0.840352 -0.346008 -0.417236 +0.615558 -0.250982 -0.747059 +0.615191 0.250029 -0.747680 +0.834314 0.438972 -0.333503 +0.274670 0.837106 -0.473085 +0.249963 0.616515 -0.746611 +-0.167195 0.654806 -0.737072 +-0.506100 0.780635 -0.366705 +-0.391918 0.788978 0.473195 +-0.250549 0.617210 0.745840 +0.169806 0.655192 0.736131 +0.325964 0.848082 0.417737 +0.577221 0.333428 0.745414 +0.832330 0.366307 0.415988 +0.092722 0.371508 0.923788 +0.236113 0.821103 0.519655 +-0.573749 0.332170 0.748649 +-0.825071 0.272863 0.494776 +-0.141921 0.315683 0.938191 +-0.318851 0.756020 0.571636 +0.317238 0.776006 0.545137 +0.248845 0.616689 0.746840 +-0.168686 0.653382 0.737995 +-0.395630 0.844991 0.359815 +-0.575127 0.332429 0.747475 +-0.825185 0.272671 0.494692 +-0.650095 -0.165820 0.741539 +-0.847433 -0.324937 0.419849 +-0.329917 -0.522977 0.785907 +-0.375728 -0.796362 0.473959 +0.252032 -0.537990 0.804392 +0.373498 -0.875660 0.306134 +0.775167 -0.318440 0.545629 +0.615558 -0.250982 0.747059 +0.615191 0.250029 0.747680 +0.901716 0.275241 0.333393 +0.391503 0.789137 0.473273 +0.249963 0.616515 0.746611 +-0.167195 0.654806 0.737072 +-0.366036 0.853817 0.370155 +96 +0 0 1 2 0 1 2 1 +0 0 2 3 0 2 3 1 +0 0 3 4 0 3 4 1 +0 4 3 5 4 3 5 1 +0 5 6 4 5 6 4 1 +0 5 7 6 5 7 6 1 +0 2 1 8 2 1 8 1 +0 8 9 2 8 9 2 1 +0 9 8 10 9 8 10 1 +0 10 11 9 10 11 9 1 +0 11 10 12 11 10 12 1 +0 12 10 13 12 10 13 1 +0 12 13 14 12 13 14 1 +0 14 15 12 14 15 12 1 +0 15 14 16 15 14 16 1 +0 16 17 15 16 17 15 1 +0 17 16 18 17 16 18 1 +0 18 19 17 18 19 17 1 +0 18 20 19 18 20 19 1 +0 19 20 21 19 20 21 1 +0 21 20 22 21 20 22 1 +0 23 21 22 23 21 22 1 +0 23 22 24 23 22 24 1 +0 22 25 24 22 25 24 1 +0 24 25 26 24 25 26 1 +0 26 27 24 26 27 24 1 +0 27 26 28 27 26 28 1 +0 28 26 29 28 26 29 1 +0 28 29 30 28 29 30 1 +0 30 31 28 30 31 28 1 +0 31 30 6 31 30 6 1 +0 31 6 7 31 6 7 1 +0 32 33 34 32 33 34 1 +0 35 32 34 35 32 34 1 +0 36 35 34 36 35 34 1 +0 37 35 36 37 35 36 1 +0 36 38 37 36 38 37 1 +0 38 39 37 38 39 37 1 +0 40 33 32 40 33 32 1 +0 32 41 40 32 41 40 1 +0 42 40 41 42 40 41 1 +0 41 43 42 41 43 42 1 +0 44 42 43 44 42 43 1 +0 45 42 44 45 42 44 1 +0 46 45 44 46 45 44 1 +0 44 47 46 44 47 46 1 +0 48 46 47 48 46 47 1 +0 47 49 48 47 49 48 1 +0 50 48 49 50 48 49 1 +0 49 51 50 49 51 50 1 +0 51 52 50 51 52 50 1 +0 53 52 51 53 52 51 1 +0 54 52 53 54 52 53 1 +0 54 53 55 54 53 55 1 +0 56 54 55 56 54 55 1 +0 56 57 54 56 57 54 1 +0 58 57 56 58 57 56 1 +0 56 59 58 56 59 58 1 +0 60 58 59 60 58 59 1 +0 61 58 60 61 58 60 1 +0 62 61 60 62 61 60 1 +0 60 63 62 60 63 62 1 +0 38 62 63 38 62 63 1 +0 39 38 63 39 38 63 1 +0 7 5 39 7 5 39 1 +0 39 5 37 39 5 37 1 +0 37 5 3 37 5 3 1 +0 3 35 37 3 35 37 1 +0 35 3 2 35 3 2 1 +0 2 32 35 2 32 35 1 +0 32 2 9 32 2 9 1 +0 9 41 32 9 41 32 1 +0 43 41 9 43 41 9 1 +0 9 11 43 9 11 43 1 +0 43 11 12 43 11 12 1 +0 44 43 12 44 43 12 1 +0 47 44 12 47 44 12 1 +0 12 15 47 12 15 47 1 +0 15 17 47 15 17 47 1 +0 49 47 17 49 47 17 1 +0 51 49 17 51 49 17 1 +0 17 19 51 17 19 51 1 +0 53 51 19 53 51 19 1 +0 19 21 53 19 21 53 1 +0 21 23 55 21 23 55 1 +0 55 23 24 55 23 24 1 +0 24 56 55 24 56 55 1 +0 24 27 59 24 27 59 1 +0 59 56 24 59 56 24 1 +0 27 28 60 27 28 60 1 +0 60 59 27 60 59 27 1 +0 28 31 63 28 31 63 1 +0 63 60 28 63 60 28 1 +0 31 7 39 31 7 39 1 +0 39 63 31 39 63 31 1 +0 55 53 21 55 53 21 1 +"inside" 0 2 +136 +0 0.545871 6.574782 4.000001 0.082192 0.409653 -1 +0 0.527650 6.000967 6.000000 0.082126 0.416299 -1 +0 3.517759 8.995436 6.000000 0.088233 0.377420 -1 +0 3.013403 9.081276 4.000001 0.087090 0.376297 -1 +0 3.514073 18.989233 6.000000 0.088225 0.246740 -1 +0 3.013403 19.081276 4.000001 0.087090 0.245537 -1 +0 1.491741 20.995436 6.000000 0.083642 0.220507 -1 +0 -1.478017 20.995436 6.000000 0.076913 0.220507 -1 +0 -1.506077 20.652702 4.000001 0.076850 0.224988 -1 +0 -3.484221 19.005362 6.000000 0.072367 0.246529 -1 +0 -2.986597 19.081276 4.000001 0.073495 0.245537 -1 +0 -3.478692 9.015251 6.000000 0.072380 0.377160 -1 +0 -0.476883 6.005363 6.000000 0.078414 0.416249 -1 +0 -0.467116 6.613743 4.000001 0.078449 0.409203 -1 +0 -0.498861 -7.986947 6.000000 0.079132 0.611176 -1 +0 0.515562 -7.994639 6.000000 0.081431 0.611277 -1 +0 0.526949 -7.493545 4.000000 0.081456 0.604724 -1 +0 3.492485 -4.994639 6.000000 0.088176 0.565923 -1 +0 3.000633 -4.993546 4.000000 0.087061 0.565909 -1 +0 3.507869 6.000966 6.000000 0.088211 0.416576 -1 +0 2.995759 4.994668 4.000000 0.087050 0.429734 -1 +0 0.522155 2.996570 6.000000 0.082559 0.450850 -1 +0 -0.472487 3.005361 6.000000 0.077660 0.450736 -1 +0 -0.486608 2.542022 4.000000 0.077629 0.456794 -1 +0 -3.474295 5.996571 6.000000 0.072390 0.416633 -1 +0 -3.004789 4.996567 4.000000 0.073454 0.429710 -1 +0 -3.498861 -4.986946 6.000000 0.072334 0.565822 -1 +0 -0.516910 -7.467229 4.000000 0.079091 0.604379 -1 +0 -0.571486 -22.010983 6.000000 0.078967 0.782863 -1 +0 0.539625 -21.973946 6.000000 0.081485 0.782379 -1 +0 0.506847 -21.462547 4.000000 0.081411 0.775691 -1 +0 22.490080 0.991055 6.000000 0.129343 0.482086 -1 +0 22.011435 0.996168 4.000000 0.128259 0.482019 -1 +0 22.477116 4.003556 6.000000 0.129174 0.447705 -1 +0 22.002260 4.005342 4.000000 0.128099 0.447682 -1 +0 21.502117 4.991519 6.000000 0.126965 0.434786 -1 +0 21.506847 4.546627 4.000000 0.126976 0.440604 -1 +0 18.494793 4.993823 6.000000 0.122100 0.434200 -1 +0 7.507869 -6.010023 6.000000 0.097274 0.573633 -1 +0 7.534371 -6.462548 4.000000 0.097334 0.579549 -1 +0 4.530946 -6.002331 6.000000 0.090529 0.573532 -1 +0 4.497674 -6.517594 4.000000 0.090453 0.580270 -1 +0 0.515562 -10.010023 6.000000 0.081431 0.625937 -1 +0 -0.506554 -10.002331 6.000000 0.079114 0.625836 -1 +0 -0.513281 -10.449017 4.000000 0.079099 0.631677 -1 +0 -4.498861 -6.002331 6.000000 0.070068 0.573532 -1 +0 -7.476655 -6.006133 6.000000 0.063321 0.573581 -1 +0 -7.474803 -6.453374 4.000000 0.063325 0.579429 -1 +0 -18.496527 5.005362 6.000000 0.038421 0.433492 -1 +0 -21.486635 5.000965 6.000000 0.033316 0.434663 -1 +0 -21.474804 4.555800 4.000000 0.033342 0.440484 -1 +0 -22.497412 4.003303 6.000000 0.031025 0.447708 -1 +0 -21.988565 3.996168 4.000000 0.032178 0.447802 -1 +0 -22.497414 1.011768 6.000000 0.030886 0.481258 -1 +0 -21.997740 0.996168 4.000000 0.032018 0.481462 -1 +0 -21.997740 0.996168 -4.000000 0.032018 0.481462 -1 +0 -21.988565 3.996168 -4.000000 0.032178 0.447802 -1 +0 -18.493153 4.537452 -4.000000 0.038428 0.439610 -1 +0 -21.474804 4.555800 -4.000000 0.033342 0.440484 -1 +0 -0.502327 -21.471722 -4.000000 0.079124 0.775811 -1 +0 -0.513281 -10.449017 -4.000000 0.079099 0.631677 -1 +0 0.511512 -10.473810 -4.000000 0.081421 0.632002 -1 +0 0.506847 -21.462547 -4.000000 0.081411 0.775691 -1 +0 -7.474803 -6.453374 -4.000000 0.063325 0.579429 -1 +0 -4.502326 -6.471723 -4.000000 0.070060 0.579670 -1 +0 4.497674 -6.517594 -4.000000 0.090453 0.580270 -1 +0 7.534371 -6.462548 -4.000000 0.097334 0.579549 -1 +0 22.011435 0.996168 -4.000000 0.128259 0.482019 -1 +0 18.506847 4.528278 -4.000000 0.122127 0.440287 -1 +0 21.506847 4.546627 -4.000000 0.126976 0.440604 -1 +0 22.002260 4.005342 -4.000000 0.128099 0.447682 -1 +0 -0.467116 6.575283 -4.000001 0.078449 0.409648 -1 +0 -2.999583 9.042815 -4.000001 0.073465 0.376800 -1 +0 3.013403 9.042815 -4.000001 0.087090 0.376800 -1 +0 0.545871 6.536322 -4.000001 0.082192 0.410099 -1 +0 -2.986597 19.042814 -4.000001 0.073495 0.246039 -1 +0 -1.506077 20.614243 -4.000001 0.076850 0.225491 -1 +0 1.493923 20.614243 -4.000001 0.083647 0.225491 -1 +0 3.013403 19.042814 -4.000001 0.087090 0.246039 -1 +0 -2.999583 9.081276 4.000001 0.073465 0.376297 -1 +0 1.493923 20.652702 4.000001 0.083647 0.224988 -1 +0 -3.484221 19.005363 -5.999992 0.072367 0.246529 -1 +0 -1.478017 20.995438 -5.999992 0.076913 0.220507 -1 +0 1.491741 20.995438 -5.999992 0.083642 0.220507 -1 +0 3.514073 18.989235 -5.999992 0.088225 0.246740 -1 +0 3.517759 8.995436 -5.999992 0.088233 0.377420 -1 +0 0.527650 6.000967 -5.999992 0.082126 0.416299 -1 +0 -0.476883 6.005363 -5.999992 0.078414 0.416249 -1 +0 -3.478692 9.015251 -5.999992 0.072380 0.377160 -1 +0 0.526949 -7.493545 -4.000000 0.081456 0.604724 -1 +0 -0.516910 -7.467229 -4.000000 0.079091 0.604379 -1 +0 -2.999367 -5.011089 -4.000000 0.073466 0.566138 -1 +0 3.000633 -4.993546 -4.000000 0.087061 0.565909 -1 +0 -3.004789 4.996567 -4.000000 0.073454 0.429710 -1 +0 -0.486608 2.542022 -4.000000 0.077629 0.456794 -1 +0 0.522483 2.523840 -4.000000 0.082560 0.457032 -1 +0 2.995759 4.994668 -4.000000 0.087050 0.429734 -1 +0 0.515562 -7.994638 -5.999992 0.081431 0.611277 -1 +0 -0.498861 -7.986946 -5.999992 0.079132 0.611176 -1 +0 -3.498861 -4.986946 -5.999992 0.072334 0.565822 -1 +0 -3.474295 5.996571 -5.999992 0.072390 0.416633 -1 +0 -0.472487 3.005361 -5.999992 0.077660 0.450736 -1 +0 0.522155 2.996570 -5.999992 0.082559 0.450850 -1 +0 3.507869 6.000966 -5.999992 0.088211 0.416576 -1 +0 3.492485 -4.994639 -5.999992 0.088176 0.565923 -1 +0 -2.999367 -5.011089 4.000000 0.073466 0.566138 -1 +0 0.522483 2.523840 4.000000 0.082560 0.457032 -1 +0 -18.493153 4.537452 4.000000 0.038428 0.439610 -1 +0 -0.502327 -21.471722 4.000000 0.079124 0.775811 -1 +0 0.511512 -10.473810 4.000000 0.081421 0.632002 -1 +0 -4.502326 -6.471723 4.000000 0.070060 0.579670 -1 +0 18.506847 4.528278 4.000000 0.122127 0.440287 -1 +0 0.539625 -21.973946 -5.999992 0.081485 0.782379 -1 +0 -0.571486 -22.010983 -5.999992 0.078967 0.782863 -1 +0 -22.497414 1.011768 -5.999992 0.030886 0.481258 -1 +0 -22.497412 4.003303 -5.999992 0.031025 0.447708 -1 +0 -21.486635 5.000965 -5.999992 0.033316 0.434663 -1 +0 -18.496527 5.005362 -5.999992 0.038421 0.433492 -1 +0 -7.476655 -6.006133 -5.999992 0.063321 0.573581 -1 +0 -4.498861 -6.002331 -5.999992 0.070068 0.573532 -1 +0 -0.506554 -10.002331 -5.999992 0.079114 0.625836 -1 +0 0.515562 -10.010023 -5.999992 0.081431 0.625937 -1 +0 4.530946 -6.002331 -5.999992 0.090529 0.573532 -1 +0 7.507869 -6.010023 -5.999992 0.097274 0.573633 -1 +0 18.494793 4.993823 -5.999992 0.122100 0.434200 -1 +0 21.502117 4.991519 -5.999992 0.126965 0.434786 -1 +0 22.477116 4.003556 -5.999992 0.129174 0.447705 -1 +0 22.490080 0.991055 -5.999992 0.129343 0.482086 -1 +0 27.495455 -0.000695 6.000000 0.139989 0.500622 -1 +0 27.501657 5.992133 6.000000 0.140002 0.422259 -1 +0 -27.479452 5.977798 6.000000 0.020154 0.421890 -1 +0 -27.479452 0.022464 6.000000 0.020154 0.499762 -1 +0 -27.479452 0.022464 -5.999992 0.020154 0.499762 -1 +0 -27.479452 5.977798 -5.999992 0.020154 0.421890 -1 +0 27.495455 -0.000695 -5.999992 0.139989 0.500622 -1 +0 27.501657 5.992133 -5.999992 0.140002 0.422259 -1 +132 +-0.426003 0.735887 0.526300 +-0.233622 0.933613 0.271639 +-0.840566 0.491072 0.228685 +-0.417847 0.108732 0.901987 +-0.941515 -0.251044 0.224779 +-0.757997 -0.443457 0.478316 +-0.381686 -0.910051 0.161625 +0.508190 -0.847889 0.151087 +0.164191 -0.601932 0.781486 +0.901153 -0.379340 0.209819 +0.835235 -0.343913 0.429077 +0.896069 0.375877 0.236171 +0.374691 0.886508 0.271497 +0.303934 0.709402 0.635904 +0.258768 0.936216 0.237776 +-0.497396 0.841970 0.209006 +-0.175843 0.691709 0.700441 +-0.900271 0.374705 0.221605 +-0.553527 0.230042 0.800430 +-0.792205 -0.442883 0.419841 +0.198560 -0.647221 0.735988 +0.370703 -0.903729 0.214134 +-0.379445 -0.900750 0.211355 +-0.267234 -0.635861 0.724063 +-0.258962 -0.891115 0.372629 +0.571732 -0.320158 0.755394 +0.900007 0.376839 0.219045 +0.444512 0.743294 0.499923 +0.375212 0.894913 0.241549 +-0.399682 0.886488 0.233225 +-0.241609 0.544018 0.803535 +-0.850800 0.481857 0.209650 +-0.493354 0.125175 0.860775 +-0.942194 -0.249067 0.224134 +-0.696036 -0.345465 0.629434 +-0.513100 -0.837067 0.189863 +-0.193002 -0.697426 0.690179 +0.377837 -0.901832 0.209617 +0.375427 -0.902918 0.209271 +0.268558 -0.635314 0.724053 +0.253267 -0.940355 0.227132 +0.373504 -0.627253 0.683409 +0.368185 -0.905916 0.209181 +-0.380733 -0.902178 0.202776 +-0.312068 -0.732110 0.605498 +-0.377631 -0.902363 0.207692 +-0.376334 -0.904227 0.201855 +-0.306911 -0.733768 0.606126 +-0.377530 -0.902841 0.205790 +0.374445 -0.904627 0.203569 +0.350872 -0.823859 0.445136 +0.848189 -0.485865 0.210973 +0.632921 -0.140551 0.761352 +0.941860 0.240138 0.235017 +0.629501 0.356219 0.690533 +0.694496 0.177608 -0.697230 +0.586021 -0.294361 -0.754938 +-0.263615 -0.446117 -0.855270 +0.229548 -0.830755 -0.507103 +0.177857 0.424208 -0.887927 +-0.240617 -0.559147 -0.793384 +0.260430 -0.640802 -0.722183 +-0.150200 0.344553 -0.926673 +-0.185852 -0.700887 -0.688634 +-0.373313 -0.631262 -0.679813 +0.235541 -0.551850 -0.799988 +0.268558 -0.635314 -0.724053 +-0.558017 0.224228 -0.798961 +0.234425 -0.556459 -0.797119 +-0.313581 -0.728305 -0.609293 +-0.642324 -0.210083 -0.737079 +0.306530 0.716441 -0.626699 +0.577698 0.154752 -0.801447 +-0.378603 0.221494 -0.898666 +-0.289905 0.722738 -0.627379 +0.757912 -0.438868 -0.482663 +0.191605 -0.440985 -0.876823 +-0.191682 -0.713712 -0.673701 +-0.829575 -0.344609 -0.439374 +0.428936 0.181684 0.884876 +-0.244206 -0.573288 0.782115 +0.941337 -0.250330 -0.226316 +0.383959 -0.906209 -0.177091 +-0.503088 -0.847547 -0.169017 +-0.899997 -0.379100 -0.215146 +-0.938372 0.246915 -0.241850 +-0.367118 0.897412 -0.244697 +0.375924 0.890688 -0.255648 +0.839355 0.498481 -0.216794 +-0.175843 0.691709 -0.700442 +0.444512 0.743293 -0.499924 +0.490340 0.130046 -0.861774 +-0.553526 0.230042 -0.800431 +-0.189592 -0.651097 -0.734933 +-0.183159 -0.436075 -0.881074 +0.177328 -0.699077 -0.692709 +0.198560 -0.647221 -0.735989 +-0.497396 0.841970 -0.209006 +0.258768 0.936216 -0.237777 +0.842085 0.497804 -0.207568 +0.793869 -0.443083 -0.416472 +-0.378237 -0.899805 -0.217459 +0.495488 -0.844803 -0.201987 +-0.792204 -0.442883 -0.419843 +-0.900271 0.374705 -0.221605 +0.349363 0.147326 0.925332 +0.226644 -0.557256 0.798810 +-0.147967 -0.352058 0.924208 +0.104073 0.244752 0.963984 +0.175034 -0.436327 0.882600 +-0.233891 -0.556756 0.797068 +0.234425 -0.556460 0.797118 +-0.394645 0.888735 -0.233248 +0.368762 0.894189 -0.253853 +0.848431 0.481177 -0.220528 +0.938303 -0.250853 -0.238035 +0.508114 -0.838633 -0.196251 +-0.250212 -0.943696 -0.216407 +-0.497086 -0.846376 -0.191191 +-0.250545 -0.943250 -0.217960 +-0.383686 -0.900106 -0.206384 +0.372887 -0.904057 -0.208891 +0.378857 -0.900080 -0.215227 +0.375427 -0.902917 -0.209272 +0.377837 -0.901831 -0.209618 +-0.380618 -0.902859 -0.199938 +-0.905945 -0.366727 -0.211603 +-0.905726 0.363690 -0.217691 +-0.341889 0.000354 0.939740 +0.342244 0.000000 0.939611 +0.342243 0.000000 -0.939612 +-0.341888 0.000354 -0.939741 +184 +0 0 1 2 0 1 2 1 +0 3 2 4 3 2 4 1 +0 5 4 6 5 4 6 1 +0 6 7 8 6 7 8 1 +0 7 9 10 7 9 10 1 +0 10 9 11 10 9 11 1 +0 11 12 13 11 12 13 1 +0 13 12 1 13 12 1 1 +0 14 15 16 14 15 16 1 +0 15 17 18 15 17 18 1 +0 18 17 19 18 17 19 1 +0 20 19 21 20 19 21 1 +0 21 22 23 21 22 23 1 +0 23 22 24 23 22 24 1 +0 25 24 26 25 24 26 1 +0 26 14 27 26 14 27 1 +0 28 29 30 28 29 30 1 +0 30 29 31 30 29 31 1 +0 32 31 33 32 31 33 1 +0 34 33 35 34 33 35 1 +0 36 35 37 36 35 37 1 +0 37 38 39 37 38 39 1 +0 39 38 40 39 38 40 1 +0 41 40 42 41 40 42 1 +0 42 43 44 42 43 44 1 +0 44 43 45 44 43 45 1 +0 45 46 47 45 46 47 1 +0 47 46 48 47 46 48 1 +0 48 49 50 48 49 50 1 +0 50 49 51 50 49 51 1 +0 52 51 53 52 51 53 1 +0 54 53 28 54 53 28 1 +0 55 56 57 55 56 57 1 +0 57 56 58 57 56 58 1 +0 59 55 57 59 55 57 1 +0 59 60 61 59 60 61 1 +0 61 62 59 61 62 59 1 +0 59 57 63 59 57 63 1 +0 63 64 59 63 64 59 1 +0 59 64 60 59 64 60 1 +0 61 65 62 61 65 62 1 +0 62 65 66 62 65 66 1 +0 67 62 66 67 62 66 1 +0 66 68 67 66 68 67 1 +0 67 68 69 67 68 69 1 +0 69 70 67 69 70 67 1 +0 71 72 73 71 72 73 1 +0 73 74 71 73 74 71 1 +0 72 75 76 72 75 76 1 +0 77 78 73 77 78 73 1 +0 73 72 76 73 72 76 1 +0 76 77 73 76 77 73 1 +0 3 79 13 3 79 13 1 +0 13 0 3 13 0 3 1 +0 8 10 79 8 10 79 1 +0 3 5 80 3 5 80 1 +0 8 79 3 8 79 3 1 +0 3 80 8 3 80 8 1 +0 2 3 0 2 3 0 1 +0 4 5 3 4 5 3 1 +0 6 80 5 6 80 5 1 +0 8 80 6 8 80 6 1 +0 10 8 7 10 8 7 1 +0 11 79 10 11 79 10 1 +0 13 79 11 13 79 11 1 +0 1 0 13 1 0 13 1 +0 75 81 82 75 81 82 1 +0 82 76 75 82 76 75 1 +0 82 83 77 82 83 77 1 +0 77 76 82 77 76 82 1 +0 83 84 78 83 84 78 1 +0 78 77 83 78 77 83 1 +0 78 84 85 78 84 85 1 +0 85 73 78 85 73 78 1 +0 73 85 86 73 85 86 1 +0 86 74 73 86 74 73 1 +0 86 87 71 86 87 71 1 +0 71 74 86 71 74 86 1 +0 71 87 88 71 87 88 1 +0 88 72 71 88 72 71 1 +0 72 88 81 72 88 81 1 +0 81 75 72 81 75 72 1 +0 89 90 91 89 90 91 1 +0 89 91 92 89 91 92 1 +0 91 93 94 91 93 94 1 +0 95 96 92 95 96 92 1 +0 92 91 94 92 91 94 1 +0 92 94 95 92 94 95 1 +0 89 97 98 89 97 98 1 +0 98 90 89 98 90 89 1 +0 90 98 99 90 98 99 1 +0 90 99 91 90 99 91 1 +0 91 99 100 91 99 100 1 +0 100 93 91 100 93 91 1 +0 101 94 93 101 94 93 1 +0 93 100 101 93 100 101 1 +0 95 94 101 95 94 101 1 +0 101 102 95 101 102 95 1 +0 96 95 102 96 95 102 1 +0 102 103 96 102 103 96 1 +0 103 104 92 103 104 92 1 +0 92 96 103 92 96 103 1 +0 92 104 97 92 104 97 1 +0 97 89 92 97 89 92 1 +0 105 27 16 105 27 16 1 +0 18 105 16 18 105 16 1 +0 23 25 105 23 25 105 1 +0 18 20 106 18 20 106 1 +0 23 105 18 23 105 18 1 +0 106 23 18 106 23 18 1 +0 16 27 14 16 27 14 1 +0 15 18 16 15 18 16 1 +0 19 20 18 19 20 18 1 +0 21 106 20 21 106 20 1 +0 23 106 21 23 106 21 1 +0 24 25 23 24 25 23 1 +0 26 105 25 26 105 25 1 +0 27 105 26 27 105 26 1 +0 107 52 54 107 52 54 1 +0 50 52 107 50 52 107 1 +0 107 54 108 107 54 108 1 +0 109 44 108 109 44 108 1 +0 108 30 109 108 30 109 1 +0 47 107 108 47 107 108 1 +0 108 110 47 108 110 47 1 +0 44 110 108 44 110 108 1 +0 30 41 109 30 41 109 1 +0 39 41 30 39 41 30 1 +0 39 30 32 39 30 32 1 +0 32 111 39 32 111 39 1 +0 36 111 32 36 111 32 1 +0 32 34 36 32 34 36 1 +0 30 108 28 30 108 28 1 +0 31 32 30 31 32 30 1 +0 33 34 32 33 34 32 1 +0 35 36 34 35 36 34 1 +0 37 111 36 37 111 36 1 +0 39 111 37 39 111 37 1 +0 40 41 39 40 41 39 1 +0 109 41 42 109 41 42 1 +0 44 109 42 44 109 42 1 +0 45 110 44 45 110 44 1 +0 47 110 45 47 110 45 1 +0 48 107 47 48 107 47 1 +0 50 107 48 50 107 48 1 +0 51 52 50 51 52 50 1 +0 53 54 52 53 54 52 1 +0 28 108 54 28 108 54 1 +0 112 113 59 112 113 59 1 +0 59 62 112 59 62 112 1 +0 114 55 59 114 55 59 1 +0 59 113 114 59 113 114 1 +0 55 114 115 55 114 115 1 +0 115 56 55 115 56 55 1 +0 56 115 116 56 115 116 1 +0 116 58 56 116 58 56 1 +0 58 116 117 58 116 117 1 +0 117 57 58 117 57 58 1 +0 57 117 118 57 117 118 1 +0 118 63 57 118 63 57 1 +0 63 118 119 63 118 119 1 +0 64 63 119 64 63 119 1 +0 120 60 64 120 60 64 1 +0 119 120 64 119 120 64 1 +0 61 60 120 61 60 120 1 +0 120 121 61 120 121 61 1 +0 61 121 122 61 121 122 1 +0 122 65 61 122 65 61 1 +0 66 65 122 66 65 122 1 +0 122 123 66 122 123 66 1 +0 66 123 124 66 123 124 1 +0 124 68 66 124 68 66 1 +0 69 68 124 69 68 124 1 +0 124 125 69 124 125 69 1 +0 126 70 69 126 70 69 1 +0 69 125 126 69 125 126 1 +0 126 127 67 126 127 67 1 +0 67 70 126 67 70 126 1 +0 67 127 112 67 127 112 1 +0 112 62 67 112 62 67 1 +0 128 129 34 128 128 34 1 +0 130 131 52 129 129 52 1 +0 132 133 56 130 130 56 1 +0 134 70 135 131 70 131 1 +"scroller" 0 1 +96 +0 -1.478017 20.995436 6.000000 0.076939 0.215925 -1 +0 1.491741 20.995436 6.000000 0.083416 0.215925 -1 +0 2.549132 27.005108 6.000000 0.085722 0.136089 -1 +0 -2.470720 27.005108 6.000000 0.074773 0.136089 -1 +0 3.514073 18.989233 6.000000 0.087827 0.240642 -1 +0 7.480893 22.005108 6.000000 0.096479 0.201305 -1 +0 -7.464517 22.005110 6.000000 0.063881 0.201305 -1 +0 -3.484221 19.005362 6.000000 0.072382 0.241157 -1 +0 3.517759 8.995436 6.000000 0.087745 0.381147 -1 +0 -3.478692 9.015251 6.000000 0.072303 0.381614 -1 +0 -0.476883 6.005363 6.000000 0.077857 0.415795 -1 +0 -3.474295 5.996571 6.000000 0.072223 0.416635 -1 +0 -0.472487 3.005361 6.000000 0.077713 0.449122 -1 +0 0.522155 2.996570 6.000000 0.082580 0.449237 -1 +0 0.527650 6.000967 6.000000 0.082488 0.415853 -1 +0 3.507869 6.000966 6.000000 0.087724 0.416578 -1 +0 -0.506554 -10.002331 6.000000 0.077611 0.635467 -1 +0 0.515562 -10.010023 6.000000 0.082824 0.635567 -1 +0 0.515562 -7.994639 6.000000 0.081197 0.612182 -1 +0 -0.498861 -7.986947 6.000000 0.078984 0.612080 -1 +0 7.487095 -0.006020 6.000000 0.096403 0.494928 -1 +0 -7.470722 0.000184 6.000000 0.063777 0.494848 -1 +0 -3.498861 -4.986946 6.000000 0.072169 0.572951 -1 +0 3.492485 -4.994639 6.000000 0.087689 0.573052 -1 +0 -4.498861 -6.002331 6.000000 0.068903 0.583294 -1 +0 4.530946 -6.002331 6.000000 0.091582 0.583294 -1 +0 7.507869 -6.010023 6.000000 0.098076 0.583394 -1 +0 -7.476655 -6.006133 6.000000 0.062408 0.583344 -1 +0 -18.496527 5.005362 6.000000 0.038553 0.433916 -1 +0 -17.519123 9.995950 6.000000 0.041860 0.364471 -1 +0 -21.486635 5.000965 6.000000 0.033025 0.433973 -1 +0 -23.502296 9.990573 6.000000 0.028809 0.364541 -1 +0 -27.479452 5.977798 6.000000 0.020135 0.416880 -1 +0 -22.497412 4.003303 6.000000 0.030821 0.446985 -1 +0 -27.479452 0.022464 6.000000 0.020135 0.494557 -1 +0 -22.497414 1.011768 6.000000 0.030821 0.486005 -1 +0 -0.491594 -27.002575 6.000000 0.079000 0.866634 -1 +0 -0.571486 -22.010983 6.000000 0.078826 0.781945 -1 +0 0.540664 -26.992649 6.000000 0.081251 0.866504 -1 +0 0.539625 -21.973946 6.000000 0.081249 0.781461 -1 +0 27.495455 -0.000695 6.000000 0.140046 0.494859 -1 +0 22.490080 0.991055 6.000000 0.129037 0.485550 -1 +0 22.477116 4.003556 6.000000 0.129009 0.446257 -1 +0 27.501657 5.992133 6.000000 0.140059 0.416693 -1 +0 23.485622 10.001644 6.000000 0.131299 0.364396 -1 +0 21.502117 4.991519 6.000000 0.126882 0.433371 -1 +0 17.513138 10.005877 6.000000 0.118271 0.364341 -1 +0 18.494793 4.993823 6.000000 0.121407 0.433341 -1 +0 2.549132 27.005108 -5.999992 0.085722 0.136089 -1 +0 1.491741 20.995438 -5.999992 0.083416 0.215925 -1 +0 -1.478017 20.995438 -5.999992 0.076939 0.215925 -1 +0 -2.470720 27.005108 -5.999992 0.074773 0.136089 -1 +0 7.480893 22.005108 -5.999992 0.096479 0.201305 -1 +0 3.514073 18.989235 -5.999992 0.087827 0.240642 -1 +0 -3.484221 19.005363 -5.999992 0.072382 0.241157 -1 +0 -7.464517 22.005112 -5.999992 0.063881 0.201305 -1 +0 3.517759 8.995436 -5.999992 0.087745 0.381147 -1 +0 -3.478692 9.015251 -5.999992 0.072303 0.381614 -1 +0 -3.474295 5.996571 -5.999992 0.072223 0.416635 -1 +0 -0.476883 6.005363 -5.999992 0.077857 0.415795 -1 +0 -0.472487 3.005361 -5.999992 0.077713 0.449122 -1 +0 0.527650 6.000967 -5.999992 0.082488 0.415853 -1 +0 0.522155 2.996570 -5.999992 0.082580 0.449237 -1 +0 3.507869 6.000966 -5.999992 0.087724 0.416578 -1 +0 0.515562 -7.994638 -5.999992 0.081197 0.612182 -1 +0 0.515562 -10.010023 -5.999992 0.082824 0.635567 -1 +0 -0.506554 -10.002331 -5.999992 0.077611 0.635467 -1 +0 -0.498861 -7.986946 -5.999992 0.078984 0.612080 -1 +0 7.487095 -0.006020 -5.999992 0.096403 0.494928 -1 +0 -7.470722 0.000184 -5.999992 0.063777 0.494848 -1 +0 -3.498861 -4.986946 -5.999992 0.072169 0.572951 -1 +0 3.492485 -4.994639 -5.999992 0.087689 0.573052 -1 +0 -4.498861 -6.002331 -5.999992 0.068903 0.583294 -1 +0 4.530946 -6.002331 -5.999992 0.091582 0.583294 -1 +0 7.507869 -6.010023 -5.999992 0.098076 0.583394 -1 +0 -7.476655 -6.006133 -5.999992 0.062408 0.583344 -1 +0 -18.496527 5.005362 -5.999992 0.038553 0.433916 -1 +0 -17.519123 9.995950 -5.999992 0.041860 0.364471 -1 +0 -21.486635 5.000965 -5.999992 0.033025 0.433973 -1 +0 -23.502296 9.990573 -5.999992 0.028809 0.364541 -1 +0 -27.479452 5.977798 -5.999992 0.020135 0.416880 -1 +0 -22.497412 4.003303 -5.999992 0.030821 0.446985 -1 +0 -27.479452 0.022464 -5.999992 0.020135 0.494557 -1 +0 -22.497414 1.011768 -5.999992 0.030821 0.486005 -1 +0 -0.571486 -22.010983 -5.999992 0.078826 0.781945 -1 +0 -0.491594 -27.002575 -5.999992 0.079000 0.866634 -1 +0 0.540664 -26.992649 -5.999992 0.081251 0.866504 -1 +0 0.539625 -21.973946 -5.999992 0.081249 0.781461 -1 +0 22.490080 0.991055 -5.999992 0.129037 0.485550 -1 +0 27.495455 -0.000695 -5.999992 0.140046 0.494859 -1 +0 22.477116 4.003556 -5.999992 0.129009 0.446257 -1 +0 27.501657 5.992133 -5.999992 0.140059 0.416693 -1 +0 23.485622 10.001644 -5.999992 0.131299 0.364396 -1 +0 21.502117 4.991519 -5.999992 0.126882 0.433371 -1 +0 17.513138 10.005877 -5.999992 0.118271 0.364341 -1 +0 18.494793 4.993823 -5.999992 0.121407 0.433341 -1 +2 +0.000000 0.000000 1.000000 +0.000000 0.000000 -1.000000 +157 +0 0 1 2 0 0 0 1 +0 3 0 2 0 0 0 1 +0 1 4 5 0 0 0 1 +0 5 2 1 0 0 0 1 +0 0 6 7 0 0 0 1 +0 0 3 6 0 0 0 1 +0 4 8 5 0 0 0 1 +0 9 7 6 0 0 0 1 +0 10 9 11 0 0 0 1 +0 11 12 10 0 0 0 1 +0 12 13 14 0 0 0 1 +0 14 10 12 0 0 0 1 +0 15 14 13 0 0 0 1 +0 15 8 14 0 0 0 1 +0 16 17 18 0 0 0 1 +0 18 19 16 0 0 0 1 +0 8 15 20 0 0 0 1 +0 20 5 8 0 0 0 1 +0 21 11 9 0 0 0 1 +0 9 6 21 0 0 0 1 +0 22 11 21 0 0 0 1 +0 23 20 15 0 0 0 1 +0 24 16 19 0 0 0 1 +0 19 22 24 0 0 0 1 +0 18 17 25 0 0 0 1 +0 25 23 18 0 0 0 1 +0 25 26 20 0 0 0 1 +0 20 23 25 0 0 0 1 +0 24 22 21 0 0 0 1 +0 21 27 24 0 0 0 1 +0 28 27 21 0 0 0 1 +0 21 29 28 0 0 0 1 +0 30 28 29 0 0 0 1 +0 30 29 31 0 0 0 1 +0 31 32 30 0 0 0 1 +0 33 30 32 0 0 0 1 +0 32 34 33 0 0 0 1 +0 33 34 35 0 0 0 1 +0 34 36 37 0 0 0 1 +0 37 35 34 0 0 0 1 +0 37 36 38 0 0 0 1 +0 38 39 37 0 0 0 1 +0 38 40 41 0 0 0 1 +0 41 39 38 0 0 0 1 +0 42 41 40 0 0 0 1 +0 40 43 42 0 0 0 1 +0 42 43 44 0 0 0 1 +0 44 45 42 0 0 0 1 +0 45 44 46 0 0 0 1 +0 45 46 47 0 0 0 1 +0 46 20 26 0 0 0 1 +0 26 47 46 0 0 0 1 +0 48 49 50 1 1 1 1 +0 48 50 51 1 1 1 1 +0 52 53 49 1 1 1 1 +0 49 48 52 1 1 1 1 +0 54 55 50 1 1 1 1 +0 55 51 50 1 1 1 1 +0 52 56 53 1 1 1 1 +0 55 54 57 1 1 1 1 +0 58 57 59 1 1 1 1 +0 59 60 58 1 1 1 1 +0 61 62 60 1 1 1 1 +0 60 59 61 1 1 1 1 +0 62 61 63 1 1 1 1 +0 61 56 63 1 1 1 1 +0 64 65 66 1 1 1 1 +0 66 67 64 1 1 1 1 +0 68 63 56 1 1 1 1 +0 56 52 68 1 1 1 1 +0 57 58 69 1 1 1 1 +0 69 55 57 1 1 1 1 +0 69 58 70 1 1 1 1 +0 63 68 71 1 1 1 1 +0 67 66 72 1 1 1 1 +0 72 70 67 1 1 1 1 +0 73 65 64 1 1 1 1 +0 64 71 73 1 1 1 1 +0 68 74 73 1 1 1 1 +0 73 71 68 1 1 1 1 +0 69 70 72 1 1 1 1 +0 72 75 69 1 1 1 1 +0 69 75 76 1 1 1 1 +0 76 77 69 1 1 1 1 +0 77 76 78 1 1 1 1 +0 79 77 78 1 1 1 1 +0 78 80 79 1 1 1 1 +0 80 78 81 1 1 1 1 +0 81 82 80 1 1 1 1 +0 83 82 81 1 1 1 1 +0 84 85 82 1 1 1 1 +0 82 83 84 1 1 1 1 +0 86 85 84 1 1 1 1 +0 84 87 86 1 1 1 1 +0 88 89 86 1 1 1 1 +0 86 87 88 1 1 1 1 +0 89 88 90 1 1 1 1 +0 90 91 89 1 1 1 1 +0 92 91 90 1 1 1 1 +0 90 93 92 1 1 1 1 +0 94 92 93 1 1 1 1 +0 95 94 93 1 1 1 1 +0 74 68 94 1 1 1 1 +0 94 95 74 1 1 1 1 +0 84 83 83 1 1 1 1 +0 67 70 58 1 1 1 1 +0 67 58 60 1 1 1 1 +0 62 63 64 1 1 1 1 +0 64 63 71 1 1 1 1 +0 67 60 64 1 1 1 1 +0 64 60 62 1 1 1 1 +0 57 54 50 1 1 1 1 +0 50 59 57 1 1 1 1 +0 56 49 53 1 1 1 1 +0 56 61 49 1 1 1 1 +0 50 49 61 1 1 1 1 +0 61 59 50 1 1 1 1 +0 84 75 72 1 1 1 1 +0 72 66 84 1 1 1 1 +0 87 65 73 1 1 1 1 +0 73 74 87 1 1 1 1 +0 87 84 66 1 1 1 1 +0 66 65 87 1 1 1 1 +0 75 84 83 1 1 1 1 +0 87 74 88 1 1 1 1 +0 74 95 88 1 1 1 1 +0 88 95 93 1 1 1 1 +0 88 93 90 1 1 1 1 +0 75 83 76 1 1 1 1 +0 83 81 76 1 1 1 1 +0 76 81 78 1 1 1 1 +0 18 23 15 0 0 0 1 +0 15 13 18 0 0 0 1 +0 19 12 11 0 0 0 1 +0 19 11 22 0 0 0 1 +0 19 18 13 0 0 0 1 +0 13 12 19 0 0 0 1 +0 10 14 1 0 0 0 1 +0 10 1 0 0 0 0 1 +0 1 14 8 0 0 0 1 +0 8 4 1 0 0 0 1 +0 7 9 0 0 0 0 1 +0 0 9 10 0 0 0 1 +0 37 39 17 0 0 0 1 +0 17 16 37 0 0 0 1 +0 24 37 16 0 0 0 1 +0 39 25 17 0 0 0 1 +0 39 26 25 0 0 0 1 +0 24 27 37 0 0 0 1 +0 37 27 35 0 0 0 1 +0 35 27 28 0 0 0 1 +0 35 28 33 0 0 0 1 +0 33 28 30 0 0 0 1 +0 39 41 26 0 0 0 1 +0 26 41 47 0 0 0 1 +0 47 41 45 0 0 0 1 +0 45 41 42 0 0 0 1 diff --git a/NoteSkins/dance/midi-note-3d/metrics.ini b/NoteSkins/dance/midi-note-3d/metrics.ini new file mode 100644 index 0000000000..8690f47b0e --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/metrics.ini @@ -0,0 +1,85 @@ +[Global] +FallbackNoteSkin=default + +[NoteDisplay] +TapNoteAnimationIsVivid=0 +DrawHoldHeadForTapsOnSameRow=1 +TapNoteAnimationLength=4 +TapAdditionAnimationLength=4 +TapMineAnimationLength=1 +TapLiftAnimationLength=4 +HoldHeadAnimationLength=4 // doesn't matter. Only 1 frame anyway. +HoldTopCapAnimationLength=4 // doesn't matter. Only 1 frame anyway. +HoldBottomCapAnimationLength=4 // doesn't matter. Only 1 frame anyway. +HoldBodyAnimationLength=4 // doesn't matter. Only 1 frame anyway. +HoldTailAnimationLength=4 // doesn't matter. Only 1 frame anyway. + +StartDrawingHoldBodyOffsetFromHead=0 +StopDrawingHoldBodyOffsetFromTail=0 + +HoldLetGoGrayPercent=0.125 + +ReverseDrawOrder=1101 +HoldHeadIsAboveWavyParts=1 +HoldTailIsAboveWavyParts=1 +TapNoteAdditionTextureCoordOffsetX=0 +TapNoteAdditionTextureCoordOffsetY=0 +FlipHeadAndTailWhenReverse=1 +FlipHoldBodyWhenReverse=1 +TopHoldAnchorWhenReverse=1 + +TapNoteNoteColorTextureCoordSpacingX=0.12 +TapNoteNoteColorTextureCoordSpacingY=0 + +TapFakeNoteColorTextureCoordSpacingX=0.12 +TapFakeNoteColorTextureCoordSpacingY=0 + +HoldHeadNoteColorTextureCoordSpacingX=0.12 +HoldHeadNoteColorTextureCoordSpacingY=0 + +[GhostArrowDim] +NoneCommand= +HitMineCommand=blend,'BlendMode_Add';diffuse,1,1,1,0.875;zoom,1;rotationz,0;linear,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0 +MissCommand=blend,'BlendMode_Add'; +W5Command=blend,'BlendMode_Add';diffuse,0.8,0.0,0.6,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W4Command=blend,'BlendMode_Add';diffuse,0.3,0.8,1.0,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W3Command=blend,'BlendMode_Add';diffuse,0.0,1.0,0.4,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W2Command=blend,'BlendMode_Add';diffuse,1.0,1.0,0.3,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W1Command=blend,'BlendMode_Add';diffuse,1.0,1.0,1.0,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +LetGoCommand=blend,'BlendMode_Add'; +HeldCommand=blend,'BlendMode_Add';diffuse,1.0,1.0,0.3,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 + +[GhostArrowBright] +NoneCommand=blend,'BlendMode_Add'; +HitMineCommand=blend,'BlendMode_Add';diffuse,1,1,1,0.875;zoom,1;rotationz,0;linear,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0 +MissCommand=blend,'BlendMode_Add'; +W5Command=blend,'BlendMode_Add';diffuse,0.8,0.0,0.6,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W4Command=blend,'BlendMode_Add';diffuse,0.3,0.8,1.0,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W3Command=blend,'BlendMode_Add';diffuse,0.0,1.0,0.4,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W2Command=blend,'BlendMode_Add';diffuse,1.0,1.0,0.3,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W1Command=blend,'BlendMode_Add';diffuse,1.0,1.0,1.0,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +LetGoCommand=blend,'BlendMode_Add'; +HeldCommand=blend,'BlendMode_Add';diffuse,1.0,1.0,0.3,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 + +[HoldGhostArrow] +HoldingOnCommand=visible,true +HoldingOffCommand=visible,false + +[ReceptorArrow] +W3Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 +W2Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 +W1Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 +InitCommand= +NoneCommand=stoptweening;zoom,0.85;linear,0.12;zoom,1 +PressCommand=stoptweening;zoom,0.85;linear,0.12;zoom,1 +[ReceptorArrowOverlay] +W3Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 +W2Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 +W1Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 +InitCommand=blend,"BlendMode_Add";effectclock,"beat";diffuseramp;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,1");effecttiming,.2,0,.8,0;effectoffset,.05 +NoneCommand=stoptweening;zoom,0.85;linear,0.12;zoom,1 +PressCommand=stoptweening;zoom,0.85;linear,0.12;zoom,1 +[ReceptorOverlay] +InitCommand=diffusealpha,0;blend,"BlendMode_Add" +PressCommand=finishtweening;zoom,0.85;decelerate,0.12;zoom,1;diffusealpha,0.6; +LiftCommand=finishtweening;accelerate,0.12;diffusealpha,0;zoom,1.2 \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/res/Resource.psd b/NoteSkins/dance/midi-note-3d/res/Resource.psd new file mode 100644 index 0000000000..2ebcfdd717 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/res/Resource.psd differ diff --git a/NoteSkins/dance/midi-note-3d/res/down hold tail active.psd b/NoteSkins/dance/midi-note-3d/res/down hold tail active.psd new file mode 100644 index 0000000000..fa89b7884a Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/res/down hold tail active.psd differ diff --git a/NoteSkins/dance/midi-note-3d/res/down hold tail inactive.psd b/NoteSkins/dance/midi-note-3d/res/down hold tail inactive.psd new file mode 100644 index 0000000000..b82e788d14 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/res/down hold tail inactive.psd differ diff --git a/NoteSkins/dance/midi-note-3d/res/down roll tail active.psd b/NoteSkins/dance/midi-note-3d/res/down roll tail active.psd new file mode 100644 index 0000000000..5c3175c83c Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/res/down roll tail active.psd differ diff --git a/NoteSkins/dance/midi-note-3d/res/down roll tail inactive.psd b/NoteSkins/dance/midi-note-3d/res/down roll tail inactive.psd new file mode 100644 index 0000000000..50fa746f70 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/res/down roll tail inactive.psd differ diff --git a/NoteSkins/dance/midi-note-3d/res/hold body active.psd b/NoteSkins/dance/midi-note-3d/res/hold body active.psd new file mode 100644 index 0000000000..6a2a6e1f34 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/res/hold body active.psd differ diff --git a/NoteSkins/dance/midi-note-3d/res/hold body inactive.psd b/NoteSkins/dance/midi-note-3d/res/hold body inactive.psd new file mode 100644 index 0000000000..4f6ec5c346 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/res/hold body inactive.psd differ diff --git a/NoteSkins/dance/midi-note-3d/res/roll body active.psd b/NoteSkins/dance/midi-note-3d/res/roll body active.psd new file mode 100644 index 0000000000..caa82b6f77 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/res/roll body active.psd differ diff --git a/NoteSkins/dance/midi-note-3d/res/roll body inactive.psd b/NoteSkins/dance/midi-note-3d/res/roll body inactive.psd new file mode 100644 index 0000000000..cc8c4208b0 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/res/roll body inactive.psd differ diff --git a/NoteSkins/dance/midi-note-3d/tex/black.png b/NoteSkins/dance/midi-note-3d/tex/black.png new file mode 100644 index 0000000000..7c8f9aa4ec Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/black.png differ diff --git a/NoteSkins/dance/midi-note-3d/tex/color in.jpg b/NoteSkins/dance/midi-note-3d/tex/color in.jpg new file mode 100644 index 0000000000..ea81427111 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/color in.jpg differ diff --git a/NoteSkins/dance/midi-note-3d/tex/color.ini b/NoteSkins/dance/midi-note-3d/tex/color.ini new file mode 100644 index 0000000000..68dc43d394 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/tex/color.ini @@ -0,0 +1,17 @@ +[AnimatedTexture] +Frame0000=color1.png +Delay0000=0.125 +Frame0001=color2.png +Delay0001=0.125 +Frame0002=color3.png +Delay0002=0.125 +Frame0003=color4.png +Delay0003=0.125 +Frame0004=color5.png +Delay0004=0.125 +Frame0005=color6.png +Delay0005=0.125 +Frame0006=color7.png +Delay0006=0.125 +Frame0007=color8.png +Delay0007=0.125 \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/tex/color1.png b/NoteSkins/dance/midi-note-3d/tex/color1.png new file mode 100644 index 0000000000..221b2a7b7b Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/color1.png differ diff --git a/NoteSkins/dance/midi-note-3d/tex/color2.png b/NoteSkins/dance/midi-note-3d/tex/color2.png new file mode 100644 index 0000000000..fbb9504283 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/color2.png differ diff --git a/NoteSkins/dance/midi-note-3d/tex/color3.png b/NoteSkins/dance/midi-note-3d/tex/color3.png new file mode 100644 index 0000000000..879f74b1e9 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/color3.png differ diff --git a/NoteSkins/dance/midi-note-3d/tex/color4.png b/NoteSkins/dance/midi-note-3d/tex/color4.png new file mode 100644 index 0000000000..7f20b92d84 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/color4.png differ diff --git a/NoteSkins/dance/midi-note-3d/tex/color5.png b/NoteSkins/dance/midi-note-3d/tex/color5.png new file mode 100644 index 0000000000..5607c6ec6c Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/color5.png differ diff --git a/NoteSkins/dance/midi-note-3d/tex/color6.png b/NoteSkins/dance/midi-note-3d/tex/color6.png new file mode 100644 index 0000000000..7f697964c0 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/color6.png differ diff --git a/NoteSkins/dance/midi-note-3d/tex/color7.png b/NoteSkins/dance/midi-note-3d/tex/color7.png new file mode 100644 index 0000000000..c789887d45 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/color7.png differ diff --git a/NoteSkins/dance/midi-note-3d/tex/color8.png b/NoteSkins/dance/midi-note-3d/tex/color8.png new file mode 100644 index 0000000000..14f27d427f Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/color8.png differ diff --git a/NoteSkins/dance/midi-note-3d/tex/res/color in.psd b/NoteSkins/dance/midi-note-3d/tex/res/color in.psd new file mode 100644 index 0000000000..c461dadaf3 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/res/color in.psd differ diff --git a/NoteSkins/dance/midi-note-3d/tex/res/color1.psd b/NoteSkins/dance/midi-note-3d/tex/res/color1.psd new file mode 100644 index 0000000000..53907c27fa Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/res/color1.psd differ diff --git a/NoteSkins/dance/midi-note-3d/tex/res/color2.psd b/NoteSkins/dance/midi-note-3d/tex/res/color2.psd new file mode 100644 index 0000000000..0adfa0c024 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/res/color2.psd differ diff --git a/NoteSkins/dance/midi-note-3d/tex/res/color3.psd b/NoteSkins/dance/midi-note-3d/tex/res/color3.psd new file mode 100644 index 0000000000..b93157c8a6 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/res/color3.psd differ diff --git a/NoteSkins/dance/midi-note-3d/tex/res/color4.psd b/NoteSkins/dance/midi-note-3d/tex/res/color4.psd new file mode 100644 index 0000000000..74f94b631c Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/res/color4.psd differ diff --git a/NoteSkins/dance/midi-note-3d/tex/res/midi-note-3d.txt b/NoteSkins/dance/midi-note-3d/tex/res/midi-note-3d.txt new file mode 100644 index 0000000000..8fd8e2b448 --- /dev/null +++ b/NoteSkins/dance/midi-note-3d/tex/res/midi-note-3d.txt @@ -0,0 +1,984 @@ +// MilkShape 3D ASCII + +Frames: 30 +Frame: 1 + +Meshes: 3 +"cell" 0 0 +64 +0 2.549132 27.005108 -5.999992 0.000000 0.000000 -1 +0 -2.470720 27.005108 -5.999992 0.000000 0.000000 -1 +0 -3.501126 29.003641 -3.999992 0.000000 0.000000 -1 +0 3.515003 29.000792 -3.999992 0.000000 0.000000 -1 +0 7.480893 22.005108 -5.999992 0.000000 0.000000 -1 +0 9.515003 22.992289 -3.999992 0.000000 0.000000 -1 +0 7.487095 -0.006020 -5.999992 0.000000 0.000000 -1 +0 9.498875 3.988278 -3.999992 0.000000 0.000000 -1 +0 -7.464517 22.005112 -5.999992 0.000000 0.000000 -1 +0 -9.501126 22.993713 -3.999992 0.000000 0.000000 -1 +0 -7.470722 0.000184 -5.999992 0.000000 0.000000 -1 +0 -9.496346 5.006423 -3.999992 0.000000 0.000000 -1 +0 -16.489040 12.002391 -3.999992 0.000000 0.000000 -1 +0 -17.519123 9.995950 -5.999992 0.000000 0.000000 -1 +0 -23.502296 9.990573 -5.999992 0.000000 0.000000 -1 +0 -24.496029 11.991723 -3.999992 0.000000 0.000000 -1 +0 -27.479452 5.977798 -5.999992 0.000000 0.000000 -1 +0 -29.504972 7.003297 -3.999992 0.000000 0.000000 -1 +0 -27.479452 0.022464 -5.999992 0.000000 0.000000 -1 +0 -29.490093 -1.017060 -3.999992 0.000000 0.000000 -1 +0 -0.491594 -27.002575 -5.999992 0.000000 0.000000 -1 +0 -0.502999 -29.987505 -3.999992 0.000000 0.000000 -1 +0 0.540664 -26.992649 -5.999992 0.000000 0.000000 -1 +0 0.530027 -29.987507 -3.999992 0.000000 0.000000 -1 +0 29.517078 -0.995554 -3.999992 0.000000 0.000000 -1 +0 27.495455 -0.000695 -5.999992 0.000000 0.000000 -1 +0 27.501657 5.992133 -5.999992 0.000000 0.000000 -1 +0 29.517847 6.998812 -3.999992 0.000000 0.000000 -1 +0 24.519735 12.004406 -3.999992 0.000000 0.000000 -1 +0 23.485622 10.001644 -5.999992 0.000000 0.000000 -1 +0 17.513138 10.005877 -5.999992 0.000000 0.000000 -1 +0 16.503641 11.993057 -3.999992 0.000000 0.000000 -1 +0 -3.501126 29.003641 3.999992 0.000000 0.000000 -1 +0 -2.470720 27.005108 5.999992 0.000000 0.000000 -1 +0 2.549132 27.005108 5.999992 0.000000 0.000000 -1 +0 3.515003 29.000792 3.999992 0.000000 0.000000 -1 +0 7.480893 22.005108 5.999992 0.000000 0.000000 -1 +0 9.515003 22.992289 3.999992 0.000000 0.000000 -1 +0 7.487095 -0.006020 5.999992 0.000000 0.000000 -1 +0 9.498875 3.988278 3.999992 0.000000 0.000000 -1 +0 -7.464517 22.005112 5.999992 0.000000 0.000000 -1 +0 -9.501126 22.993713 3.999992 0.000000 0.000000 -1 +0 -7.470722 0.000184 5.999992 0.000000 0.000000 -1 +0 -9.496346 5.006423 3.999992 0.000000 0.000000 -1 +0 -16.489040 12.002391 3.999992 0.000000 0.000000 -1 +0 -17.519123 9.995950 5.999992 0.000000 0.000000 -1 +0 -23.502296 9.990573 5.999992 0.000000 0.000000 -1 +0 -24.496029 11.991723 3.999992 0.000000 0.000000 -1 +0 -27.479452 5.977798 5.999992 0.000000 0.000000 -1 +0 -29.504972 7.003297 3.999992 0.000000 0.000000 -1 +0 -27.479452 0.022464 5.999992 0.000000 0.000000 -1 +0 -29.490093 -1.017060 3.999992 0.000000 0.000000 -1 +0 -0.491594 -27.002575 5.999992 0.000000 0.000000 -1 +0 -0.502999 -29.981012 3.999992 0.000000 0.000000 -1 +0 0.540664 -26.992649 5.999992 0.000000 0.000000 -1 +0 0.530027 -29.981014 3.999992 0.000000 0.000000 -1 +0 29.517078 -0.995554 3.999992 0.000000 0.000000 -1 +0 27.495455 -0.000695 5.999992 0.000000 0.000000 -1 +0 27.501657 5.992133 5.999992 0.000000 0.000000 -1 +0 29.517847 6.998812 3.999992 0.000000 0.000000 -1 +0 24.519735 12.004406 3.999992 0.000000 0.000000 -1 +0 23.485622 10.001644 5.999992 0.000000 0.000000 -1 +0 17.513138 10.005877 5.999992 0.000000 0.000000 -1 +0 16.503641 11.993057 3.999992 0.000000 0.000000 -1 +64 +0.169806 0.655192 -0.736131 +-0.250549 0.617210 -0.745840 +-0.275250 0.836959 -0.473009 +0.459405 0.785493 -0.414666 +0.577221 0.333428 -0.745414 +0.881916 0.227749 -0.412741 +0.092722 0.371508 -0.923788 +0.169860 0.707114 -0.686394 +-0.573749 0.332170 -0.748649 +-0.879427 0.314309 -0.357516 +-0.141921 0.315683 -0.938191 +-0.262755 0.616506 -0.742213 +0.344982 0.840986 -0.416810 +0.248845 0.616689 -0.746840 +-0.168686 0.653382 -0.737995 +-0.385134 0.776941 -0.498031 +-0.575127 0.332429 -0.747475 +-0.879422 0.314342 -0.357500 +-0.650095 -0.165820 -0.741539 +-0.785052 -0.458118 -0.416920 +-0.329746 -0.522471 -0.786315 +-0.234369 -0.850153 -0.471498 +0.251898 -0.537389 -0.804835 +0.353500 -0.814060 -0.460808 +0.840352 -0.346008 -0.417236 +0.615558 -0.250982 -0.747059 +0.615191 0.250029 -0.747680 +0.834314 0.438972 -0.333503 +0.274670 0.837106 -0.473085 +0.249963 0.616515 -0.746611 +-0.167195 0.654806 -0.737072 +-0.506100 0.780635 -0.366705 +-0.391918 0.788978 0.473195 +-0.250549 0.617210 0.745840 +0.169806 0.655192 0.736131 +0.325964 0.848082 0.417737 +0.577221 0.333428 0.745414 +0.832330 0.366307 0.415988 +0.092722 0.371508 0.923788 +0.236113 0.821103 0.519655 +-0.573749 0.332170 0.748649 +-0.825071 0.272863 0.494776 +-0.141921 0.315683 0.938191 +-0.318851 0.756020 0.571636 +0.317238 0.776006 0.545137 +0.248845 0.616689 0.746840 +-0.168686 0.653382 0.737995 +-0.395630 0.844991 0.359815 +-0.575127 0.332429 0.747475 +-0.825185 0.272671 0.494692 +-0.650095 -0.165820 0.741539 +-0.847433 -0.324937 0.419849 +-0.329917 -0.522977 0.785907 +-0.375728 -0.796362 0.473959 +0.252032 -0.537990 0.804392 +0.373498 -0.875660 0.306134 +0.775167 -0.318440 0.545629 +0.615558 -0.250982 0.747059 +0.615191 0.250029 0.747680 +0.901716 0.275241 0.333393 +0.391503 0.789137 0.473273 +0.249963 0.616515 0.746611 +-0.167195 0.654806 0.737072 +-0.366036 0.853817 0.370155 +96 +0 0 1 2 0 1 2 1 +0 0 2 3 0 2 3 1 +0 0 3 4 0 3 4 1 +0 4 3 5 4 3 5 1 +0 5 6 4 5 6 4 1 +0 5 7 6 5 7 6 1 +0 2 1 8 2 1 8 1 +0 8 9 2 8 9 2 1 +0 9 8 10 9 8 10 1 +0 10 11 9 10 11 9 1 +0 11 10 12 11 10 12 1 +0 12 10 13 12 10 13 1 +0 12 13 14 12 13 14 1 +0 14 15 12 14 15 12 1 +0 15 14 16 15 14 16 1 +0 16 17 15 16 17 15 1 +0 17 16 18 17 16 18 1 +0 18 19 17 18 19 17 1 +0 18 20 19 18 20 19 1 +0 19 20 21 19 20 21 1 +0 21 20 22 21 20 22 1 +0 23 21 22 23 21 22 1 +0 23 22 24 23 22 24 1 +0 22 25 24 22 25 24 1 +0 24 25 26 24 25 26 1 +0 26 27 24 26 27 24 1 +0 27 26 28 27 26 28 1 +0 28 26 29 28 26 29 1 +0 28 29 30 28 29 30 1 +0 30 31 28 30 31 28 1 +0 31 30 6 31 30 6 1 +0 31 6 7 31 6 7 1 +0 32 33 34 32 33 34 1 +0 35 32 34 35 32 34 1 +0 36 35 34 36 35 34 1 +0 37 35 36 37 35 36 1 +0 36 38 37 36 38 37 1 +0 38 39 37 38 39 37 1 +0 40 33 32 40 33 32 1 +0 32 41 40 32 41 40 1 +0 42 40 41 42 40 41 1 +0 41 43 42 41 43 42 1 +0 44 42 43 44 42 43 1 +0 45 42 44 45 42 44 1 +0 46 45 44 46 45 44 1 +0 44 47 46 44 47 46 1 +0 48 46 47 48 46 47 1 +0 47 49 48 47 49 48 1 +0 50 48 49 50 48 49 1 +0 49 51 50 49 51 50 1 +0 51 52 50 51 52 50 1 +0 53 52 51 53 52 51 1 +0 54 52 53 54 52 53 1 +0 54 53 55 54 53 55 1 +0 56 54 55 56 54 55 1 +0 56 57 54 56 57 54 1 +0 58 57 56 58 57 56 1 +0 56 59 58 56 59 58 1 +0 60 58 59 60 58 59 1 +0 61 58 60 61 58 60 1 +0 62 61 60 62 61 60 1 +0 60 63 62 60 63 62 1 +0 38 62 63 38 62 63 1 +0 39 38 63 39 38 63 1 +0 7 5 39 7 5 39 1 +0 39 5 37 39 5 37 1 +0 37 5 3 37 5 3 1 +0 3 35 37 3 35 37 1 +0 35 3 2 35 3 2 1 +0 2 32 35 2 32 35 1 +0 32 2 9 32 2 9 1 +0 9 41 32 9 41 32 1 +0 43 41 9 43 41 9 1 +0 9 11 43 9 11 43 1 +0 43 11 12 43 11 12 1 +0 44 43 12 44 43 12 1 +0 47 44 12 47 44 12 1 +0 12 15 47 12 15 47 1 +0 15 17 47 15 17 47 1 +0 49 47 17 49 47 17 1 +0 51 49 17 51 49 17 1 +0 17 19 51 17 19 51 1 +0 53 51 19 53 51 19 1 +0 19 21 53 19 21 53 1 +0 21 23 55 21 23 55 1 +0 55 23 24 55 23 24 1 +0 24 56 55 24 56 55 1 +0 24 27 59 24 27 59 1 +0 59 56 24 59 56 24 1 +0 27 28 60 27 28 60 1 +0 60 59 27 60 59 27 1 +0 28 31 63 28 31 63 1 +0 63 60 28 63 60 28 1 +0 31 7 39 31 7 39 1 +0 39 63 31 39 63 31 1 +0 55 53 21 55 53 21 1 +"inside" 0 2 +136 +0 0.545871 6.574782 4.000001 0.082192 0.409653 -1 +0 0.527650 6.000967 6.000000 0.082126 0.416299 -1 +0 3.517759 8.995436 6.000000 0.088233 0.377420 -1 +0 3.013403 9.081276 4.000001 0.087090 0.376297 -1 +0 3.514073 18.989233 6.000000 0.088225 0.246740 -1 +0 3.013403 19.081276 4.000001 0.087090 0.245537 -1 +0 1.491741 20.995436 6.000000 0.083642 0.220507 -1 +0 -1.478017 20.995436 6.000000 0.076913 0.220507 -1 +0 -1.506077 20.652702 4.000001 0.076850 0.224988 -1 +0 -3.484221 19.005362 6.000000 0.072367 0.246529 -1 +0 -2.986597 19.081276 4.000001 0.073495 0.245537 -1 +0 -3.478692 9.015251 6.000000 0.072380 0.377160 -1 +0 -0.476883 6.005363 6.000000 0.078414 0.416249 -1 +0 -0.467116 6.613743 4.000001 0.078449 0.409203 -1 +0 -0.498861 -7.986947 6.000000 0.079132 0.611176 -1 +0 0.515562 -7.994639 6.000000 0.081431 0.611277 -1 +0 0.526949 -7.493545 4.000000 0.081456 0.604724 -1 +0 3.492485 -4.994639 6.000000 0.088176 0.565923 -1 +0 3.000633 -4.993546 4.000000 0.087061 0.565909 -1 +0 3.507869 6.000966 6.000000 0.088211 0.416576 -1 +0 2.995759 4.994668 4.000000 0.087050 0.429734 -1 +0 0.522155 2.996570 6.000000 0.082559 0.450850 -1 +0 -0.472487 3.005361 6.000000 0.077660 0.450736 -1 +0 -0.486608 2.542022 4.000000 0.077629 0.456794 -1 +0 -3.474295 5.996571 6.000000 0.072390 0.416633 -1 +0 -3.004789 4.996567 4.000000 0.073454 0.429710 -1 +0 -3.498861 -4.986946 6.000000 0.072334 0.565822 -1 +0 -0.516910 -7.467229 4.000000 0.079091 0.604379 -1 +0 -0.571486 -22.010983 6.000000 0.078967 0.782863 -1 +0 0.539625 -21.973946 6.000000 0.081485 0.782379 -1 +0 0.506847 -21.462547 4.000000 0.081411 0.775691 -1 +0 22.490080 0.991055 6.000000 0.129343 0.482086 -1 +0 22.011435 0.996168 4.000000 0.128259 0.482019 -1 +0 22.477116 4.003556 6.000000 0.129174 0.447705 -1 +0 22.002260 4.005342 4.000000 0.128099 0.447682 -1 +0 21.502117 4.991519 6.000000 0.126965 0.434786 -1 +0 21.506847 4.546627 4.000000 0.126976 0.440604 -1 +0 18.494793 4.993823 6.000000 0.122100 0.434200 -1 +0 7.507869 -6.010023 6.000000 0.097274 0.573633 -1 +0 7.534371 -6.462548 4.000000 0.097334 0.579549 -1 +0 4.530946 -6.002331 6.000000 0.090529 0.573532 -1 +0 4.497674 -6.517594 4.000000 0.090453 0.580270 -1 +0 0.515562 -10.010023 6.000000 0.081431 0.625937 -1 +0 -0.506554 -10.002331 6.000000 0.079114 0.625836 -1 +0 -0.513281 -10.449017 4.000000 0.079099 0.631677 -1 +0 -4.498861 -6.002331 6.000000 0.070068 0.573532 -1 +0 -7.476655 -6.006133 6.000000 0.063321 0.573581 -1 +0 -7.474803 -6.453374 4.000000 0.063325 0.579429 -1 +0 -18.496527 5.005362 6.000000 0.038421 0.433492 -1 +0 -21.486635 5.000965 6.000000 0.033316 0.434663 -1 +0 -21.474804 4.555800 4.000000 0.033342 0.440484 -1 +0 -22.497412 4.003303 6.000000 0.031025 0.447708 -1 +0 -21.988565 3.996168 4.000000 0.032178 0.447802 -1 +0 -22.497414 1.011768 6.000000 0.030886 0.481258 -1 +0 -21.997740 0.996168 4.000000 0.032018 0.481462 -1 +0 -21.997740 0.996168 -4.000000 0.032018 0.481462 -1 +0 -21.988565 3.996168 -4.000000 0.032178 0.447802 -1 +0 -18.493153 4.537452 -4.000000 0.038428 0.439610 -1 +0 -21.474804 4.555800 -4.000000 0.033342 0.440484 -1 +0 -0.502327 -21.471722 -4.000000 0.079124 0.775811 -1 +0 -0.513281 -10.449017 -4.000000 0.079099 0.631677 -1 +0 0.511512 -10.473810 -4.000000 0.081421 0.632002 -1 +0 0.506847 -21.462547 -4.000000 0.081411 0.775691 -1 +0 -7.474803 -6.453374 -4.000000 0.063325 0.579429 -1 +0 -4.502326 -6.471723 -4.000000 0.070060 0.579670 -1 +0 4.497674 -6.517594 -4.000000 0.090453 0.580270 -1 +0 7.534371 -6.462548 -4.000000 0.097334 0.579549 -1 +0 22.011435 0.996168 -4.000000 0.128259 0.482019 -1 +0 18.506847 4.528278 -4.000000 0.122127 0.440287 -1 +0 21.506847 4.546627 -4.000000 0.126976 0.440604 -1 +0 22.002260 4.005342 -4.000000 0.128099 0.447682 -1 +0 -0.467116 6.575283 -4.000001 0.078449 0.409648 -1 +0 -2.999583 9.042815 -4.000001 0.073465 0.376800 -1 +0 3.013403 9.042815 -4.000001 0.087090 0.376800 -1 +0 0.545871 6.536322 -4.000001 0.082192 0.410099 -1 +0 -2.986597 19.042814 -4.000001 0.073495 0.246039 -1 +0 -1.506077 20.614243 -4.000001 0.076850 0.225491 -1 +0 1.493923 20.614243 -4.000001 0.083647 0.225491 -1 +0 3.013403 19.042814 -4.000001 0.087090 0.246039 -1 +0 -2.999583 9.081276 4.000001 0.073465 0.376297 -1 +0 1.493923 20.652702 4.000001 0.083647 0.224988 -1 +0 -3.484221 19.005363 -5.999992 0.072367 0.246529 -1 +0 -1.478017 20.995438 -5.999992 0.076913 0.220507 -1 +0 1.491741 20.995438 -5.999992 0.083642 0.220507 -1 +0 3.514073 18.989235 -5.999992 0.088225 0.246740 -1 +0 3.517759 8.995436 -5.999992 0.088233 0.377420 -1 +0 0.527650 6.000967 -5.999992 0.082126 0.416299 -1 +0 -0.476883 6.005363 -5.999992 0.078414 0.416249 -1 +0 -3.478692 9.015251 -5.999992 0.072380 0.377160 -1 +0 0.526949 -7.493545 -4.000000 0.081456 0.604724 -1 +0 -0.516910 -7.467229 -4.000000 0.079091 0.604379 -1 +0 -2.999367 -5.011089 -4.000000 0.073466 0.566138 -1 +0 3.000633 -4.993546 -4.000000 0.087061 0.565909 -1 +0 -3.004789 4.996567 -4.000000 0.073454 0.429710 -1 +0 -0.486608 2.542022 -4.000000 0.077629 0.456794 -1 +0 0.522483 2.523840 -4.000000 0.082560 0.457032 -1 +0 2.995759 4.994668 -4.000000 0.087050 0.429734 -1 +0 0.515562 -7.994638 -5.999992 0.081431 0.611277 -1 +0 -0.498861 -7.986946 -5.999992 0.079132 0.611176 -1 +0 -3.498861 -4.986946 -5.999992 0.072334 0.565822 -1 +0 -3.474295 5.996571 -5.999992 0.072390 0.416633 -1 +0 -0.472487 3.005361 -5.999992 0.077660 0.450736 -1 +0 0.522155 2.996570 -5.999992 0.082559 0.450850 -1 +0 3.507869 6.000966 -5.999992 0.088211 0.416576 -1 +0 3.492485 -4.994639 -5.999992 0.088176 0.565923 -1 +0 -2.999367 -5.011089 4.000000 0.073466 0.566138 -1 +0 0.522483 2.523840 4.000000 0.082560 0.457032 -1 +0 -18.493153 4.537452 4.000000 0.038428 0.439610 -1 +0 -0.502327 -21.471722 4.000000 0.079124 0.775811 -1 +0 0.511512 -10.473810 4.000000 0.081421 0.632002 -1 +0 -4.502326 -6.471723 4.000000 0.070060 0.579670 -1 +0 18.506847 4.528278 4.000000 0.122127 0.440287 -1 +0 0.539625 -21.973946 -5.999992 0.081485 0.782379 -1 +0 -0.571486 -22.010983 -5.999992 0.078967 0.782863 -1 +0 -22.497414 1.011768 -5.999992 0.030886 0.481258 -1 +0 -22.497412 4.003303 -5.999992 0.031025 0.447708 -1 +0 -21.486635 5.000965 -5.999992 0.033316 0.434663 -1 +0 -18.496527 5.005362 -5.999992 0.038421 0.433492 -1 +0 -7.476655 -6.006133 -5.999992 0.063321 0.573581 -1 +0 -4.498861 -6.002331 -5.999992 0.070068 0.573532 -1 +0 -0.506554 -10.002331 -5.999992 0.079114 0.625836 -1 +0 0.515562 -10.010023 -5.999992 0.081431 0.625937 -1 +0 4.530946 -6.002331 -5.999992 0.090529 0.573532 -1 +0 7.507869 -6.010023 -5.999992 0.097274 0.573633 -1 +0 18.494793 4.993823 -5.999992 0.122100 0.434200 -1 +0 21.502117 4.991519 -5.999992 0.126965 0.434786 -1 +0 22.477116 4.003556 -5.999992 0.129174 0.447705 -1 +0 22.490080 0.991055 -5.999992 0.129343 0.482086 -1 +0 27.495455 -0.000695 6.000000 0.139989 0.500622 -1 +0 27.501657 5.992133 6.000000 0.140002 0.422259 -1 +0 -27.479452 5.977798 6.000000 0.020154 0.421890 -1 +0 -27.479452 0.022464 6.000000 0.020154 0.499762 -1 +0 -27.479452 0.022464 -5.999992 0.020154 0.499762 -1 +0 -27.479452 5.977798 -5.999992 0.020154 0.421890 -1 +0 27.495455 -0.000695 -5.999992 0.139989 0.500622 -1 +0 27.501657 5.992133 -5.999992 0.140002 0.422259 -1 +132 +-0.426003 0.735887 0.526300 +-0.233622 0.933613 0.271639 +-0.840566 0.491072 0.228685 +-0.417847 0.108732 0.901987 +-0.941515 -0.251044 0.224779 +-0.757997 -0.443457 0.478316 +-0.381686 -0.910051 0.161625 +0.508190 -0.847889 0.151087 +0.164191 -0.601932 0.781486 +0.901153 -0.379340 0.209819 +0.835235 -0.343913 0.429077 +0.896069 0.375877 0.236171 +0.374691 0.886508 0.271497 +0.303934 0.709402 0.635904 +0.258768 0.936216 0.237776 +-0.497396 0.841970 0.209006 +-0.175843 0.691709 0.700441 +-0.900271 0.374705 0.221605 +-0.553527 0.230042 0.800430 +-0.792205 -0.442883 0.419841 +0.198560 -0.647221 0.735988 +0.370703 -0.903729 0.214134 +-0.379445 -0.900750 0.211355 +-0.267234 -0.635861 0.724063 +-0.258962 -0.891115 0.372629 +0.571732 -0.320158 0.755394 +0.900007 0.376839 0.219045 +0.444512 0.743294 0.499923 +0.375212 0.894913 0.241549 +-0.399682 0.886488 0.233225 +-0.241609 0.544018 0.803535 +-0.850800 0.481857 0.209650 +-0.493354 0.125175 0.860775 +-0.942194 -0.249067 0.224134 +-0.696036 -0.345465 0.629434 +-0.513100 -0.837067 0.189863 +-0.193002 -0.697426 0.690179 +0.377837 -0.901832 0.209617 +0.375427 -0.902918 0.209271 +0.268558 -0.635314 0.724053 +0.253267 -0.940355 0.227132 +0.373504 -0.627253 0.683409 +0.368185 -0.905916 0.209181 +-0.380733 -0.902178 0.202776 +-0.312068 -0.732110 0.605498 +-0.377631 -0.902363 0.207692 +-0.376334 -0.904227 0.201855 +-0.306911 -0.733768 0.606126 +-0.377530 -0.902841 0.205790 +0.374445 -0.904627 0.203569 +0.350872 -0.823859 0.445136 +0.848189 -0.485865 0.210973 +0.632921 -0.140551 0.761352 +0.941860 0.240138 0.235017 +0.629501 0.356219 0.690533 +0.694496 0.177608 -0.697230 +0.586021 -0.294361 -0.754938 +-0.263615 -0.446117 -0.855270 +0.229548 -0.830755 -0.507103 +0.177857 0.424208 -0.887927 +-0.240617 -0.559147 -0.793384 +0.260430 -0.640802 -0.722183 +-0.150200 0.344553 -0.926673 +-0.185852 -0.700887 -0.688634 +-0.373313 -0.631262 -0.679813 +0.235541 -0.551850 -0.799988 +0.268558 -0.635314 -0.724053 +-0.558017 0.224228 -0.798961 +0.234425 -0.556459 -0.797119 +-0.313581 -0.728305 -0.609293 +-0.642324 -0.210083 -0.737079 +0.306530 0.716441 -0.626699 +0.577698 0.154752 -0.801447 +-0.378603 0.221494 -0.898666 +-0.289905 0.722738 -0.627379 +0.757912 -0.438868 -0.482663 +0.191605 -0.440985 -0.876823 +-0.191682 -0.713712 -0.673701 +-0.829575 -0.344609 -0.439374 +0.428936 0.181684 0.884876 +-0.244206 -0.573288 0.782115 +0.941337 -0.250330 -0.226316 +0.383959 -0.906209 -0.177091 +-0.503088 -0.847547 -0.169017 +-0.899997 -0.379100 -0.215146 +-0.938372 0.246915 -0.241850 +-0.367118 0.897412 -0.244697 +0.375924 0.890688 -0.255648 +0.839355 0.498481 -0.216794 +-0.175843 0.691709 -0.700442 +0.444512 0.743293 -0.499924 +0.490340 0.130046 -0.861774 +-0.553526 0.230042 -0.800431 +-0.189592 -0.651097 -0.734933 +-0.183159 -0.436075 -0.881074 +0.177328 -0.699077 -0.692709 +0.198560 -0.647221 -0.735989 +-0.497396 0.841970 -0.209006 +0.258768 0.936216 -0.237777 +0.842085 0.497804 -0.207568 +0.793869 -0.443083 -0.416472 +-0.378237 -0.899805 -0.217459 +0.495488 -0.844803 -0.201987 +-0.792204 -0.442883 -0.419843 +-0.900271 0.374705 -0.221605 +0.349363 0.147326 0.925332 +0.226644 -0.557256 0.798810 +-0.147967 -0.352058 0.924208 +0.104073 0.244752 0.963984 +0.175034 -0.436327 0.882600 +-0.233891 -0.556756 0.797068 +0.234425 -0.556460 0.797118 +-0.394645 0.888735 -0.233248 +0.368762 0.894189 -0.253853 +0.848431 0.481177 -0.220528 +0.938303 -0.250853 -0.238035 +0.508114 -0.838633 -0.196251 +-0.250212 -0.943696 -0.216407 +-0.497086 -0.846376 -0.191191 +-0.250545 -0.943250 -0.217960 +-0.383686 -0.900106 -0.206384 +0.372887 -0.904057 -0.208891 +0.378857 -0.900080 -0.215227 +0.375427 -0.902917 -0.209272 +0.377837 -0.901831 -0.209618 +-0.380618 -0.902859 -0.199938 +-0.905945 -0.366727 -0.211603 +-0.905726 0.363690 -0.217691 +-0.341889 0.000354 0.939740 +0.342244 0.000000 0.939611 +0.342243 0.000000 -0.939612 +-0.341888 0.000354 -0.939741 +184 +0 0 1 2 0 1 2 1 +0 3 2 4 3 2 4 1 +0 5 4 6 5 4 6 1 +0 6 7 8 6 7 8 1 +0 7 9 10 7 9 10 1 +0 10 9 11 10 9 11 1 +0 11 12 13 11 12 13 1 +0 13 12 1 13 12 1 1 +0 14 15 16 14 15 16 1 +0 15 17 18 15 17 18 1 +0 18 17 19 18 17 19 1 +0 20 19 21 20 19 21 1 +0 21 22 23 21 22 23 1 +0 23 22 24 23 22 24 1 +0 25 24 26 25 24 26 1 +0 26 14 27 26 14 27 1 +0 28 29 30 28 29 30 1 +0 30 29 31 30 29 31 1 +0 32 31 33 32 31 33 1 +0 34 33 35 34 33 35 1 +0 36 35 37 36 35 37 1 +0 37 38 39 37 38 39 1 +0 39 38 40 39 38 40 1 +0 41 40 42 41 40 42 1 +0 42 43 44 42 43 44 1 +0 44 43 45 44 43 45 1 +0 45 46 47 45 46 47 1 +0 47 46 48 47 46 48 1 +0 48 49 50 48 49 50 1 +0 50 49 51 50 49 51 1 +0 52 51 53 52 51 53 1 +0 54 53 28 54 53 28 1 +0 55 56 57 55 56 57 1 +0 57 56 58 57 56 58 1 +0 59 55 57 59 55 57 1 +0 59 60 61 59 60 61 1 +0 61 62 59 61 62 59 1 +0 59 57 63 59 57 63 1 +0 63 64 59 63 64 59 1 +0 59 64 60 59 64 60 1 +0 61 65 62 61 65 62 1 +0 62 65 66 62 65 66 1 +0 67 62 66 67 62 66 1 +0 66 68 67 66 68 67 1 +0 67 68 69 67 68 69 1 +0 69 70 67 69 70 67 1 +0 71 72 73 71 72 73 1 +0 73 74 71 73 74 71 1 +0 72 75 76 72 75 76 1 +0 77 78 73 77 78 73 1 +0 73 72 76 73 72 76 1 +0 76 77 73 76 77 73 1 +0 3 79 13 3 79 13 1 +0 13 0 3 13 0 3 1 +0 8 10 79 8 10 79 1 +0 3 5 80 3 5 80 1 +0 8 79 3 8 79 3 1 +0 3 80 8 3 80 8 1 +0 2 3 0 2 3 0 1 +0 4 5 3 4 5 3 1 +0 6 80 5 6 80 5 1 +0 8 80 6 8 80 6 1 +0 10 8 7 10 8 7 1 +0 11 79 10 11 79 10 1 +0 13 79 11 13 79 11 1 +0 1 0 13 1 0 13 1 +0 75 81 82 75 81 82 1 +0 82 76 75 82 76 75 1 +0 82 83 77 82 83 77 1 +0 77 76 82 77 76 82 1 +0 83 84 78 83 84 78 1 +0 78 77 83 78 77 83 1 +0 78 84 85 78 84 85 1 +0 85 73 78 85 73 78 1 +0 73 85 86 73 85 86 1 +0 86 74 73 86 74 73 1 +0 86 87 71 86 87 71 1 +0 71 74 86 71 74 86 1 +0 71 87 88 71 87 88 1 +0 88 72 71 88 72 71 1 +0 72 88 81 72 88 81 1 +0 81 75 72 81 75 72 1 +0 89 90 91 89 90 91 1 +0 89 91 92 89 91 92 1 +0 91 93 94 91 93 94 1 +0 95 96 92 95 96 92 1 +0 92 91 94 92 91 94 1 +0 92 94 95 92 94 95 1 +0 89 97 98 89 97 98 1 +0 98 90 89 98 90 89 1 +0 90 98 99 90 98 99 1 +0 90 99 91 90 99 91 1 +0 91 99 100 91 99 100 1 +0 100 93 91 100 93 91 1 +0 101 94 93 101 94 93 1 +0 93 100 101 93 100 101 1 +0 95 94 101 95 94 101 1 +0 101 102 95 101 102 95 1 +0 96 95 102 96 95 102 1 +0 102 103 96 102 103 96 1 +0 103 104 92 103 104 92 1 +0 92 96 103 92 96 103 1 +0 92 104 97 92 104 97 1 +0 97 89 92 97 89 92 1 +0 105 27 16 105 27 16 1 +0 18 105 16 18 105 16 1 +0 23 25 105 23 25 105 1 +0 18 20 106 18 20 106 1 +0 23 105 18 23 105 18 1 +0 106 23 18 106 23 18 1 +0 16 27 14 16 27 14 1 +0 15 18 16 15 18 16 1 +0 19 20 18 19 20 18 1 +0 21 106 20 21 106 20 1 +0 23 106 21 23 106 21 1 +0 24 25 23 24 25 23 1 +0 26 105 25 26 105 25 1 +0 27 105 26 27 105 26 1 +0 107 52 54 107 52 54 1 +0 50 52 107 50 52 107 1 +0 107 54 108 107 54 108 1 +0 109 44 108 109 44 108 1 +0 108 30 109 108 30 109 1 +0 47 107 108 47 107 108 1 +0 108 110 47 108 110 47 1 +0 44 110 108 44 110 108 1 +0 30 41 109 30 41 109 1 +0 39 41 30 39 41 30 1 +0 39 30 32 39 30 32 1 +0 32 111 39 32 111 39 1 +0 36 111 32 36 111 32 1 +0 32 34 36 32 34 36 1 +0 30 108 28 30 108 28 1 +0 31 32 30 31 32 30 1 +0 33 34 32 33 34 32 1 +0 35 36 34 35 36 34 1 +0 37 111 36 37 111 36 1 +0 39 111 37 39 111 37 1 +0 40 41 39 40 41 39 1 +0 109 41 42 109 41 42 1 +0 44 109 42 44 109 42 1 +0 45 110 44 45 110 44 1 +0 47 110 45 47 110 45 1 +0 48 107 47 48 107 47 1 +0 50 107 48 50 107 48 1 +0 51 52 50 51 52 50 1 +0 53 54 52 53 54 52 1 +0 28 108 54 28 108 54 1 +0 112 113 59 112 113 59 1 +0 59 62 112 59 62 112 1 +0 114 55 59 114 55 59 1 +0 59 113 114 59 113 114 1 +0 55 114 115 55 114 115 1 +0 115 56 55 115 56 55 1 +0 56 115 116 56 115 116 1 +0 116 58 56 116 58 56 1 +0 58 116 117 58 116 117 1 +0 117 57 58 117 57 58 1 +0 57 117 118 57 117 118 1 +0 118 63 57 118 63 57 1 +0 63 118 119 63 118 119 1 +0 64 63 119 64 63 119 1 +0 120 60 64 120 60 64 1 +0 119 120 64 119 120 64 1 +0 61 60 120 61 60 120 1 +0 120 121 61 120 121 61 1 +0 61 121 122 61 121 122 1 +0 122 65 61 122 65 61 1 +0 66 65 122 66 65 122 1 +0 122 123 66 122 123 66 1 +0 66 123 124 66 123 124 1 +0 124 68 66 124 68 66 1 +0 69 68 124 69 68 124 1 +0 124 125 69 124 125 69 1 +0 126 70 69 126 70 69 1 +0 69 125 126 69 125 126 1 +0 126 127 67 126 127 67 1 +0 67 70 126 67 70 126 1 +0 67 127 112 67 127 112 1 +0 112 62 67 112 62 67 1 +0 128 129 34 128 128 34 1 +0 130 131 52 129 129 52 1 +0 132 133 56 130 130 56 1 +0 134 70 135 131 70 131 1 +"scroller" 0 1 +96 +0 -1.478017 20.995436 6.000000 0.076939 0.215925 -1 +0 1.491741 20.995436 6.000000 0.083416 0.215925 -1 +0 2.549132 27.005108 6.000000 0.085722 0.136089 -1 +0 -2.470720 27.005108 6.000000 0.074773 0.136089 -1 +0 3.514073 18.989233 6.000000 0.087827 0.240642 -1 +0 7.480893 22.005108 6.000000 0.096479 0.201305 -1 +0 -7.464517 22.005110 6.000000 0.063881 0.201305 -1 +0 -3.484221 19.005362 6.000000 0.072382 0.241157 -1 +0 3.517759 8.995436 6.000000 0.087745 0.381147 -1 +0 -3.478692 9.015251 6.000000 0.072303 0.381614 -1 +0 -0.476883 6.005363 6.000000 0.077857 0.415795 -1 +0 -3.474295 5.996571 6.000000 0.072223 0.416635 -1 +0 -0.472487 3.005361 6.000000 0.077713 0.449122 -1 +0 0.522155 2.996570 6.000000 0.082580 0.449237 -1 +0 0.527650 6.000967 6.000000 0.082488 0.415853 -1 +0 3.507869 6.000966 6.000000 0.087724 0.416578 -1 +0 -0.506554 -10.002331 6.000000 0.077611 0.635467 -1 +0 0.515562 -10.010023 6.000000 0.082824 0.635567 -1 +0 0.515562 -7.994639 6.000000 0.081197 0.612182 -1 +0 -0.498861 -7.986947 6.000000 0.078984 0.612080 -1 +0 7.487095 -0.006020 6.000000 0.096403 0.494928 -1 +0 -7.470722 0.000184 6.000000 0.063777 0.494848 -1 +0 -3.498861 -4.986946 6.000000 0.072169 0.572951 -1 +0 3.492485 -4.994639 6.000000 0.087689 0.573052 -1 +0 -4.498861 -6.002331 6.000000 0.068903 0.583294 -1 +0 4.530946 -6.002331 6.000000 0.091582 0.583294 -1 +0 7.507869 -6.010023 6.000000 0.098076 0.583394 -1 +0 -7.476655 -6.006133 6.000000 0.062408 0.583344 -1 +0 -18.496527 5.005362 6.000000 0.038553 0.433916 -1 +0 -17.519123 9.995950 6.000000 0.041860 0.364471 -1 +0 -21.486635 5.000965 6.000000 0.033025 0.433973 -1 +0 -23.502296 9.990573 6.000000 0.028809 0.364541 -1 +0 -27.479452 5.977798 6.000000 0.020135 0.416880 -1 +0 -22.497412 4.003303 6.000000 0.030821 0.446985 -1 +0 -27.479452 0.022464 6.000000 0.020135 0.494557 -1 +0 -22.497414 1.011768 6.000000 0.030821 0.486005 -1 +0 -0.491594 -27.002575 6.000000 0.079000 0.866634 -1 +0 -0.571486 -22.010983 6.000000 0.078826 0.781945 -1 +0 0.540664 -26.992649 6.000000 0.081251 0.866504 -1 +0 0.539625 -21.973946 6.000000 0.081249 0.781461 -1 +0 27.495455 -0.000695 6.000000 0.140046 0.494859 -1 +0 22.490080 0.991055 6.000000 0.129037 0.485550 -1 +0 22.477116 4.003556 6.000000 0.129009 0.446257 -1 +0 27.501657 5.992133 6.000000 0.140059 0.416693 -1 +0 23.485622 10.001644 6.000000 0.131299 0.364396 -1 +0 21.502117 4.991519 6.000000 0.126882 0.433371 -1 +0 17.513138 10.005877 6.000000 0.118271 0.364341 -1 +0 18.494793 4.993823 6.000000 0.121407 0.433341 -1 +0 2.549132 27.005108 -5.999992 0.085722 0.136089 -1 +0 1.491741 20.995438 -5.999992 0.083416 0.215925 -1 +0 -1.478017 20.995438 -5.999992 0.076939 0.215925 -1 +0 -2.470720 27.005108 -5.999992 0.074773 0.136089 -1 +0 7.480893 22.005108 -5.999992 0.096479 0.201305 -1 +0 3.514073 18.989235 -5.999992 0.087827 0.240642 -1 +0 -3.484221 19.005363 -5.999992 0.072382 0.241157 -1 +0 -7.464517 22.005112 -5.999992 0.063881 0.201305 -1 +0 3.517759 8.995436 -5.999992 0.087745 0.381147 -1 +0 -3.478692 9.015251 -5.999992 0.072303 0.381614 -1 +0 -3.474295 5.996571 -5.999992 0.072223 0.416635 -1 +0 -0.476883 6.005363 -5.999992 0.077857 0.415795 -1 +0 -0.472487 3.005361 -5.999992 0.077713 0.449122 -1 +0 0.527650 6.000967 -5.999992 0.082488 0.415853 -1 +0 0.522155 2.996570 -5.999992 0.082580 0.449237 -1 +0 3.507869 6.000966 -5.999992 0.087724 0.416578 -1 +0 0.515562 -7.994638 -5.999992 0.081197 0.612182 -1 +0 0.515562 -10.010023 -5.999992 0.082824 0.635567 -1 +0 -0.506554 -10.002331 -5.999992 0.077611 0.635467 -1 +0 -0.498861 -7.986946 -5.999992 0.078984 0.612080 -1 +0 7.487095 -0.006020 -5.999992 0.096403 0.494928 -1 +0 -7.470722 0.000184 -5.999992 0.063777 0.494848 -1 +0 -3.498861 -4.986946 -5.999992 0.072169 0.572951 -1 +0 3.492485 -4.994639 -5.999992 0.087689 0.573052 -1 +0 -4.498861 -6.002331 -5.999992 0.068903 0.583294 -1 +0 4.530946 -6.002331 -5.999992 0.091582 0.583294 -1 +0 7.507869 -6.010023 -5.999992 0.098076 0.583394 -1 +0 -7.476655 -6.006133 -5.999992 0.062408 0.583344 -1 +0 -18.496527 5.005362 -5.999992 0.038553 0.433916 -1 +0 -17.519123 9.995950 -5.999992 0.041860 0.364471 -1 +0 -21.486635 5.000965 -5.999992 0.033025 0.433973 -1 +0 -23.502296 9.990573 -5.999992 0.028809 0.364541 -1 +0 -27.479452 5.977798 -5.999992 0.020135 0.416880 -1 +0 -22.497412 4.003303 -5.999992 0.030821 0.446985 -1 +0 -27.479452 0.022464 -5.999992 0.020135 0.494557 -1 +0 -22.497414 1.011768 -5.999992 0.030821 0.486005 -1 +0 -0.571486 -22.010983 -5.999992 0.078826 0.781945 -1 +0 -0.491594 -27.002575 -5.999992 0.079000 0.866634 -1 +0 0.540664 -26.992649 -5.999992 0.081251 0.866504 -1 +0 0.539625 -21.973946 -5.999992 0.081249 0.781461 -1 +0 22.490080 0.991055 -5.999992 0.129037 0.485550 -1 +0 27.495455 -0.000695 -5.999992 0.140046 0.494859 -1 +0 22.477116 4.003556 -5.999992 0.129009 0.446257 -1 +0 27.501657 5.992133 -5.999992 0.140059 0.416693 -1 +0 23.485622 10.001644 -5.999992 0.131299 0.364396 -1 +0 21.502117 4.991519 -5.999992 0.126882 0.433371 -1 +0 17.513138 10.005877 -5.999992 0.118271 0.364341 -1 +0 18.494793 4.993823 -5.999992 0.121407 0.433341 -1 +2 +0.000000 0.000000 1.000000 +0.000000 0.000000 -1.000000 +157 +0 0 1 2 0 0 0 1 +0 3 0 2 0 0 0 1 +0 1 4 5 0 0 0 1 +0 5 2 1 0 0 0 1 +0 0 6 7 0 0 0 1 +0 0 3 6 0 0 0 1 +0 4 8 5 0 0 0 1 +0 9 7 6 0 0 0 1 +0 10 9 11 0 0 0 1 +0 11 12 10 0 0 0 1 +0 12 13 14 0 0 0 1 +0 14 10 12 0 0 0 1 +0 15 14 13 0 0 0 1 +0 15 8 14 0 0 0 1 +0 16 17 18 0 0 0 1 +0 18 19 16 0 0 0 1 +0 8 15 20 0 0 0 1 +0 20 5 8 0 0 0 1 +0 21 11 9 0 0 0 1 +0 9 6 21 0 0 0 1 +0 22 11 21 0 0 0 1 +0 23 20 15 0 0 0 1 +0 24 16 19 0 0 0 1 +0 19 22 24 0 0 0 1 +0 18 17 25 0 0 0 1 +0 25 23 18 0 0 0 1 +0 25 26 20 0 0 0 1 +0 20 23 25 0 0 0 1 +0 24 22 21 0 0 0 1 +0 21 27 24 0 0 0 1 +0 28 27 21 0 0 0 1 +0 21 29 28 0 0 0 1 +0 30 28 29 0 0 0 1 +0 30 29 31 0 0 0 1 +0 31 32 30 0 0 0 1 +0 33 30 32 0 0 0 1 +0 32 34 33 0 0 0 1 +0 33 34 35 0 0 0 1 +0 34 36 37 0 0 0 1 +0 37 35 34 0 0 0 1 +0 37 36 38 0 0 0 1 +0 38 39 37 0 0 0 1 +0 38 40 41 0 0 0 1 +0 41 39 38 0 0 0 1 +0 42 41 40 0 0 0 1 +0 40 43 42 0 0 0 1 +0 42 43 44 0 0 0 1 +0 44 45 42 0 0 0 1 +0 45 44 46 0 0 0 1 +0 45 46 47 0 0 0 1 +0 46 20 26 0 0 0 1 +0 26 47 46 0 0 0 1 +0 48 49 50 1 1 1 1 +0 48 50 51 1 1 1 1 +0 52 53 49 1 1 1 1 +0 49 48 52 1 1 1 1 +0 54 55 50 1 1 1 1 +0 55 51 50 1 1 1 1 +0 52 56 53 1 1 1 1 +0 55 54 57 1 1 1 1 +0 58 57 59 1 1 1 1 +0 59 60 58 1 1 1 1 +0 61 62 60 1 1 1 1 +0 60 59 61 1 1 1 1 +0 62 61 63 1 1 1 1 +0 61 56 63 1 1 1 1 +0 64 65 66 1 1 1 1 +0 66 67 64 1 1 1 1 +0 68 63 56 1 1 1 1 +0 56 52 68 1 1 1 1 +0 57 58 69 1 1 1 1 +0 69 55 57 1 1 1 1 +0 69 58 70 1 1 1 1 +0 63 68 71 1 1 1 1 +0 67 66 72 1 1 1 1 +0 72 70 67 1 1 1 1 +0 73 65 64 1 1 1 1 +0 64 71 73 1 1 1 1 +0 68 74 73 1 1 1 1 +0 73 71 68 1 1 1 1 +0 69 70 72 1 1 1 1 +0 72 75 69 1 1 1 1 +0 69 75 76 1 1 1 1 +0 76 77 69 1 1 1 1 +0 77 76 78 1 1 1 1 +0 79 77 78 1 1 1 1 +0 78 80 79 1 1 1 1 +0 80 78 81 1 1 1 1 +0 81 82 80 1 1 1 1 +0 83 82 81 1 1 1 1 +0 84 85 82 1 1 1 1 +0 82 83 84 1 1 1 1 +0 86 85 84 1 1 1 1 +0 84 87 86 1 1 1 1 +0 88 89 86 1 1 1 1 +0 86 87 88 1 1 1 1 +0 89 88 90 1 1 1 1 +0 90 91 89 1 1 1 1 +0 92 91 90 1 1 1 1 +0 90 93 92 1 1 1 1 +0 94 92 93 1 1 1 1 +0 95 94 93 1 1 1 1 +0 74 68 94 1 1 1 1 +0 94 95 74 1 1 1 1 +0 84 83 83 1 1 1 1 +0 67 70 58 1 1 1 1 +0 67 58 60 1 1 1 1 +0 62 63 64 1 1 1 1 +0 64 63 71 1 1 1 1 +0 67 60 64 1 1 1 1 +0 64 60 62 1 1 1 1 +0 57 54 50 1 1 1 1 +0 50 59 57 1 1 1 1 +0 56 49 53 1 1 1 1 +0 56 61 49 1 1 1 1 +0 50 49 61 1 1 1 1 +0 61 59 50 1 1 1 1 +0 84 75 72 1 1 1 1 +0 72 66 84 1 1 1 1 +0 87 65 73 1 1 1 1 +0 73 74 87 1 1 1 1 +0 87 84 66 1 1 1 1 +0 66 65 87 1 1 1 1 +0 75 84 83 1 1 1 1 +0 87 74 88 1 1 1 1 +0 74 95 88 1 1 1 1 +0 88 95 93 1 1 1 1 +0 88 93 90 1 1 1 1 +0 75 83 76 1 1 1 1 +0 83 81 76 1 1 1 1 +0 76 81 78 1 1 1 1 +0 18 23 15 0 0 0 1 +0 15 13 18 0 0 0 1 +0 19 12 11 0 0 0 1 +0 19 11 22 0 0 0 1 +0 19 18 13 0 0 0 1 +0 13 12 19 0 0 0 1 +0 10 14 1 0 0 0 1 +0 10 1 0 0 0 0 1 +0 1 14 8 0 0 0 1 +0 8 4 1 0 0 0 1 +0 7 9 0 0 0 0 1 +0 0 9 10 0 0 0 1 +0 37 39 17 0 0 0 1 +0 17 16 37 0 0 0 1 +0 24 37 16 0 0 0 1 +0 39 25 17 0 0 0 1 +0 39 26 25 0 0 0 1 +0 24 27 37 0 0 0 1 +0 37 27 35 0 0 0 1 +0 35 27 28 0 0 0 1 +0 35 28 33 0 0 0 1 +0 33 28 30 0 0 0 1 +0 39 41 26 0 0 0 1 +0 26 41 47 0 0 0 1 +0 47 41 45 0 0 0 1 +0 45 41 42 0 0 0 1 + +Materials: 3 +"cells" +0.588235 0.588235 0.588235 1.000000 +0.588235 0.588235 0.588235 1.000000 +0.898039 0.898039 0.898039 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"..\black.png" +"" +"19 - Default" +1.000000 1.000000 1.000000 1.000000 +0.800000 0.800000 0.800000 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"..\color4.png" +"" +"19 - Inside" +1.000000 1.000000 1.000000 1.000000 +1.000000 1.000000 1.000000 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"..\color in.jpg" +"" + +Bones: 0 +GroupComments: 0 +MaterialComments: 0 +BoneComments: 0 +ModelComment: 0 diff --git a/NoteSkins/dance/midi-note-3d/tex/res/midinote3d.ms3d b/NoteSkins/dance/midi-note-3d/tex/res/midinote3d.ms3d new file mode 100644 index 0000000000..f6cb68a6b2 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/res/midinote3d.ms3d differ diff --git a/NoteSkins/dance/midi-note-3d/tex/res/midinote3d1.ms3d b/NoteSkins/dance/midi-note-3d/tex/res/midinote3d1.ms3d new file mode 100644 index 0000000000..ac6d167b68 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/res/midinote3d1.ms3d differ diff --git a/NoteSkins/dance/midi-note-3d/tex/res/midinote3d2.ms3d b/NoteSkins/dance/midi-note-3d/tex/res/midinote3d2.ms3d new file mode 100644 index 0000000000..99ae61e4af Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/res/midinote3d2.ms3d differ diff --git a/NoteSkins/dance/midi-note-3d/tex/res/midinote3d3.ms3d b/NoteSkins/dance/midi-note-3d/tex/res/midinote3d3.ms3d new file mode 100644 index 0000000000..79b808d1d9 Binary files /dev/null and b/NoteSkins/dance/midi-note-3d/tex/res/midinote3d3.ms3d differ diff --git a/NoteSkins/dance/midi-note/NoteSkin.lua b/NoteSkins/dance/midi-note/NoteSkin.lua index 90b3738186..2ae3231d5f 100644 --- a/NoteSkins/dance/midi-note/NoteSkin.lua +++ b/NoteSkins/dance/midi-note/NoteSkin.lua @@ -20,14 +20,14 @@ ret.Redir = function(sButton, sElement) if sElement == "Hold Head Active" or sElement == "Roll Head Active" then - sElement = "StreamHead Active"; + sElement = "Hold Head Active"; end -- Test if sElement == "Hold Head Inactive" or sElement == "Roll Head Inactive" then - sElement = "StreamHead Inactive"; + sElement = "Hold Head Inactive"; end sButton = ret.RedirTable[sButton]; diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 2b44eee848..ff7db0434f 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -534,6 +534,7 @@ x2.5=2.5x 8=8 8th=8th 9=9 +Actual=Actual Add=Additive All Music=All Music AllDifficulties=All Difficulties @@ -706,6 +707,7 @@ Song BGAnimation=Song BGAnimation Song Bitmap=Song Bitmap Song Movie=Song Movie Space=Space +Specified=Specified Split=Split Standard=Standard Start=Start @@ -822,6 +824,7 @@ Delete=Delete Delete beat and shift up=Delete beat and shift up Description=Description Difficulty=Difficulty +Display BPM=Display BPM DisplayAspectRatio=Aspect Ratio DisplayColorDepth=Display Color DisplayResolution=Display Resolution @@ -901,9 +904,11 @@ Low Meter=Low Meter Advanced Options=Advanced Options Main title=Main title Main title transliteration=Main title transliteration +Max BPM=Max Specified BPM MaxTextureResolution=Texture Resolution MenuTimer=Menu Timer Meter=Meter +Min BPM=Min Specified BPM Mines=Mines MoveRandomToEnd=Random At End More Options=More Options @@ -1223,6 +1228,8 @@ Enter a new main title transliteration.=Enter a new main title transliteration. Enter a new main title.=Enter a new main title. Enter a new sub title transliteration.=Enter a new sub title transliteration. Enter a new sub title.=Enter a new sub title. +Enter a new min BPM.=Enter the minimum displayed BPM. +Enter a new max BPM.=Enter the maximum displayed BPM. More than %d notes per measure is not allowed. This change has been reverted.=More than %d notes per measure is not allowed. This change has been reverted. No backgrounds available=No backgrounds available EditHelpText=Up/Down:\n change beat\nLeft/Right:\n change snap\nNumber keys:\n add/remove\n tap note\nCreate hold note:\n Hold a number\n while moving\n Up or Down\nCreate roll note:\n Hold Shift,\n then create a\n hold note.\nSpace bar:\n Set area\n marker\nEnter:\n Area Menu\nEscape:\n Main Menu\nF1:\n Show help\n diff --git a/src/BPMDisplay.cpp b/src/BPMDisplay.cpp index 80ce23a145..bd26e2c099 100644 --- a/src/BPMDisplay.cpp +++ b/src/BPMDisplay.cpp @@ -180,8 +180,8 @@ void BPMDisplay::SetBpmFromSong( const Song* pSong ) ASSERT( pSong ); switch( pSong->m_DisplayBPMType ) { - case Song::DISPLAY_ACTUAL: - case Song::DISPLAY_SPECIFIED: + case DISPLAY_BPM_ACTUAL: + case DISPLAY_BPM_SPECIFIED: { DisplayBpms bpms; pSong->GetDisplayBpms( bpms ); @@ -189,7 +189,7 @@ void BPMDisplay::SetBpmFromSong( const Song* pSong ) m_fCycleTime = 1.0f; } break; - case Song::DISPLAY_RANDOM: + case DISPLAY_BPM_RANDOM: CycleRandomly(); break; default: diff --git a/src/NoteField.cpp b/src/NoteField.cpp index 958866b0a5..d321c0ad26 100644 --- a/src/NoteField.cpp +++ b/src/NoteField.cpp @@ -766,80 +766,68 @@ void NoteField::DrawPrimitives() ASSERT(GAMESTATE->m_pCurSong); // BPM text - const vector &aBPMSegments = GAMESTATE->m_pCurSong->m_Timing.m_BPMSegments; - for( unsigned i=0; im_pCurSong->m_Timing.m_BPMSegments, seg ) { - if( aBPMSegments[i].m_iStartRow >= iFirstRowToDraw && - aBPMSegments[i].m_iStartRow <= iLastRowToDraw) + if( seg->m_iStartRow >= iFirstRowToDraw && seg->m_iStartRow <= iLastRowToDraw ) { - float fBeat = NoteRowToBeat(aBPMSegments[i].m_iStartRow); + float fBeat = NoteRowToBeat(seg->m_iStartRow); if( IS_ON_SCREEN(fBeat) ) - DrawBPMText( fBeat, aBPMSegments[i].GetBPM() ); + DrawBPMText( fBeat, seg->GetBPM() ); } } // Freeze text - const vector &aStopSegments = GAMESTATE->m_pCurSong->m_Timing.m_StopSegments; - for( unsigned i=0; im_pCurSong->m_Timing.m_StopSegments, seg ) { - if( aStopSegments[i].m_iStartRow >= iFirstRowToDraw && - aStopSegments[i].m_iStartRow <= iLastRowToDraw) + if( seg->m_iStartRow >= iFirstRowToDraw && seg->m_iStartRow <= iLastRowToDraw ) { - float fBeat = NoteRowToBeat(aStopSegments[i].m_iStartRow); + float fBeat = NoteRowToBeat(seg->m_iStartRow); if( IS_ON_SCREEN(fBeat) ) - DrawFreezeText( fBeat, aStopSegments[i].m_fStopSeconds, aStopSegments[i].m_bDelay ); + DrawFreezeText( fBeat, seg->m_fStopSeconds, seg->m_bDelay ); } } // Warp text - const vector &aWarpSegments = GAMESTATE->m_pCurSong->m_Timing.m_WarpSegments; - for( unsigned i=0; im_pCurSong->m_Timing.m_WarpSegments, seg ) { - if( aWarpSegments[i].m_iStartRow >= iFirstRowToDraw && - aWarpSegments[i].m_iStartRow <= iLastRowToDraw) + if( seg->m_iStartRow >= iFirstRowToDraw && seg->m_iStartRow <= iLastRowToDraw ) { - float fBeat = NoteRowToBeat(aWarpSegments[i].m_iStartRow); + float fBeat = NoteRowToBeat(seg->m_iStartRow); if( IS_ON_SCREEN(fBeat) ) - DrawWarpText( fBeat, aWarpSegments[i].m_fEndBeat ); + DrawWarpText( fBeat, seg->m_fEndBeat ); } } // Time Signature text - const vector &vTimeSignatureSegments = GAMESTATE->m_pCurSong->m_Timing.m_vTimeSignatureSegments; - for( unsigned i=0; im_pCurSong->m_Timing.m_vTimeSignatureSegments, seg ) { - if( vTimeSignatureSegments[i].m_iStartRow >= iFirstRowToDraw && - vTimeSignatureSegments[i].m_iStartRow <= iLastRowToDraw) + if( seg->m_iStartRow >= iFirstRowToDraw && seg->m_iStartRow <= iLastRowToDraw ) { - float fBeat = NoteRowToBeat(vTimeSignatureSegments[i].m_iStartRow); + float fBeat = NoteRowToBeat(seg->m_iStartRow); if( IS_ON_SCREEN(fBeat) ) - DrawTimeSignatureText( fBeat, vTimeSignatureSegments[i].m_iNumerator, vTimeSignatureSegments[i].m_iDenominator ); + DrawTimeSignatureText( fBeat, seg->m_iNumerator, seg->m_iDenominator ); } } - + // Tickcount text - const vector &tTickcountSegments = GAMESTATE->m_pCurSong->m_Timing.m_TickcountSegments; - for( unsigned i=0; im_pCurSong->m_Timing.m_TickcountSegments, seg ) { - if( tTickcountSegments[i].m_iStartRow >= iFirstRowToDraw && - tTickcountSegments[i].m_iStartRow <= iLastRowToDraw) + if( seg->m_iStartRow >= iFirstRowToDraw && seg->m_iStartRow <= iLastRowToDraw ) { - float fBeat = NoteRowToBeat(tTickcountSegments[i].m_iStartRow); + float fBeat = NoteRowToBeat(seg->m_iStartRow); if( IS_ON_SCREEN(fBeat) ) - DrawTickcountText( fBeat, tTickcountSegments[i].m_iTicks ); + DrawTickcountText( fBeat, seg->m_iTicks ); } } // Combo text - const vector &tComboSegments = GAMESTATE->m_pCurSong->m_Timing.m_ComboSegments; - for( unsigned i=0; im_pCurSong->m_Timing.m_ComboSegments, seg ) { - if( tComboSegments[i].m_iStartRow >= iFirstRowToDraw && - tComboSegments[i].m_iStartRow <= iLastRowToDraw) + if( seg->m_iStartRow >= iFirstRowToDraw && seg->m_iStartRow <= iLastRowToDraw ) { - float fBeat = NoteRowToBeat(tComboSegments[i].m_iStartRow); + float fBeat = NoteRowToBeat(seg->m_iStartRow); if( IS_ON_SCREEN(fBeat) ) - DrawComboText( fBeat, tComboSegments[i].m_iCombo ); + DrawComboText( fBeat, seg->m_iCombo ); } } diff --git a/src/NotesLoaderDWI.cpp b/src/NotesLoaderDWI.cpp index 30386f0f8c..b15c74252f 100644 --- a/src/NotesLoaderDWI.cpp +++ b/src/NotesLoaderDWI.cpp @@ -500,18 +500,18 @@ bool DWILoader::LoadFromDir( const RString &sPath_, Song &out, set &Bla * worth bothering with since we don't display fractional BPM anyway.) */ if( sscanf( sParams[1], "%i..%i", &iMin, &iMax ) == 2 ) { - out.m_DisplayBPMType = Song::DISPLAY_SPECIFIED; + out.m_DisplayBPMType = DISPLAY_BPM_SPECIFIED; out.m_fSpecifiedBPMMin = (float) iMin; out.m_fSpecifiedBPMMax = (float) iMax; } else if( sscanf( sParams[1], "%i", &iMin ) == 1 ) { - out.m_DisplayBPMType = Song::DISPLAY_SPECIFIED; + out.m_DisplayBPMType = DISPLAY_BPM_SPECIFIED; out.m_fSpecifiedBPMMin = out.m_fSpecifiedBPMMax = (float) iMin; } else { - out.m_DisplayBPMType = Song::DISPLAY_RANDOM; + out.m_DisplayBPMType = DISPLAY_BPM_RANDOM; } } diff --git a/src/NotesLoaderSM.cpp b/src/NotesLoaderSM.cpp index 4937e37b52..7fa211df32 100644 --- a/src/NotesLoaderSM.cpp +++ b/src/NotesLoaderSM.cpp @@ -581,10 +581,10 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache { // #DISPLAYBPM:[xxx][xxx:xxx]|[*]; if( sParams[1] == "*" ) - out.m_DisplayBPMType = Song::DISPLAY_RANDOM; + out.m_DisplayBPMType = DISPLAY_BPM_RANDOM; else { - out.m_DisplayBPMType = Song::DISPLAY_SPECIFIED; + out.m_DisplayBPMType = DISPLAY_BPM_SPECIFIED; out.m_fSpecifiedBPMMin = StringToFloat( sParams[1] ); if( sParams[2].empty() ) out.m_fSpecifiedBPMMax = out.m_fSpecifiedBPMMin; diff --git a/src/NotesLoaderSMA.cpp b/src/NotesLoaderSMA.cpp index 2d60122764..dd6ce2c60f 100644 --- a/src/NotesLoaderSMA.cpp +++ b/src/NotesLoaderSMA.cpp @@ -230,10 +230,10 @@ bool SMALoader::LoadFromSMAFile( const RString &sPath, Song &out ) { // #DISPLAYBPM:[xxx][xxx:xxx]|[*]; if( sParams[1] == "*" ) - out.m_DisplayBPMType = Song::DISPLAY_RANDOM; + out.m_DisplayBPMType = DISPLAY_BPM_RANDOM; else { - out.m_DisplayBPMType = Song::DISPLAY_SPECIFIED; + out.m_DisplayBPMType = DISPLAY_BPM_SPECIFIED; out.m_fSpecifiedBPMMin = StringToFloat( sParams[1] ); if( sParams[2].empty() ) out.m_fSpecifiedBPMMax = out.m_fSpecifiedBPMMin; diff --git a/src/NotesLoaderSSC.cpp b/src/NotesLoaderSSC.cpp index 1868dfd19d..409999960d 100644 --- a/src/NotesLoaderSSC.cpp +++ b/src/NotesLoaderSSC.cpp @@ -256,10 +256,10 @@ bool SSCLoader::LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCach { // #DISPLAYBPM:[xxx][xxx:xxx]|[*]; if( sParams[1] == "*" ) - out.m_DisplayBPMType = Song::DISPLAY_RANDOM; + out.m_DisplayBPMType = DISPLAY_BPM_RANDOM; else { - out.m_DisplayBPMType = Song::DISPLAY_SPECIFIED; + out.m_DisplayBPMType = DISPLAY_BPM_SPECIFIED; out.m_fSpecifiedBPMMin = StringToFloat( sParams[1] ); if( sParams[2].empty() ) out.m_fSpecifiedBPMMax = out.m_fSpecifiedBPMMin; diff --git a/src/NotesWriterDWI.cpp b/src/NotesWriterDWI.cpp index 2398b708e7..ce8ba00231 100644 --- a/src/NotesWriterDWI.cpp +++ b/src/NotesWriterDWI.cpp @@ -360,16 +360,16 @@ bool NotesWriterDWI::Write( RString sPath, const Song &out ) f.PutLine( ssprintf("#CDTITLE:%s;", DwiEscape(out.m_sCDTitleFile).c_str()) ); switch( out.m_DisplayBPMType ) { - case Song::DISPLAY_ACTUAL: + case DISPLAY_BPM_ACTUAL: // write nothing break; - case Song::DISPLAY_SPECIFIED: + case DISPLAY_BPM_SPECIFIED: if( out.m_fSpecifiedBPMMin == out.m_fSpecifiedBPMMax ) f.PutLine( ssprintf("#DISPLAYBPM:%i;\n", (int) out.m_fSpecifiedBPMMin) ); else f.PutLine( ssprintf("#DISPLAYBPM:%i..%i;\n", (int) out.m_fSpecifiedBPMMin, (int) out.m_fSpecifiedBPMMax) ); break; - case Song::DISPLAY_RANDOM: + case DISPLAY_BPM_RANDOM: f.PutLine( "#DISPLAYBPM:*" ); break; } diff --git a/src/NotesWriterSM.cpp b/src/NotesWriterSM.cpp index 13d3e21a3b..920081509a 100644 --- a/src/NotesWriterSM.cpp +++ b/src/NotesWriterSM.cpp @@ -94,17 +94,17 @@ static void WriteGlobalTags( RageFile &f, const Song &out ) switch( out.m_DisplayBPMType ) { - case Song::DISPLAY_ACTUAL: + case DISPLAY_BPM_ACTUAL: // write nothing break; - case Song::DISPLAY_SPECIFIED: + case DISPLAY_BPM_SPECIFIED: if( out.m_fSpecifiedBPMMin == out.m_fSpecifiedBPMMax ) f.PutLine( ssprintf( "#DISPLAYBPM:%.3f;", out.m_fSpecifiedBPMMin ) ); else f.PutLine( ssprintf( "#DISPLAYBPM:%.3f:%.3f;", out.m_fSpecifiedBPMMin, out.m_fSpecifiedBPMMax ) ); break; - case Song::DISPLAY_RANDOM: + case DISPLAY_BPM_RANDOM: f.PutLine( ssprintf( "#DISPLAYBPM:*;" ) ); break; } diff --git a/src/NotesWriterSSC.cpp b/src/NotesWriterSSC.cpp index 36c170b475..ca681fe307 100644 --- a/src/NotesWriterSSC.cpp +++ b/src/NotesWriterSSC.cpp @@ -91,16 +91,16 @@ static void WriteGlobalTags( RageFile &f, const Song &out ) switch( out.m_DisplayBPMType ) { - case Song::DISPLAY_ACTUAL: + case DISPLAY_BPM_ACTUAL: // write nothing break; - case Song::DISPLAY_SPECIFIED: + case DISPLAY_BPM_SPECIFIED: if( out.m_fSpecifiedBPMMin == out.m_fSpecifiedBPMMax ) f.PutLine( ssprintf( "#DISPLAYBPM:%.6f;", out.m_fSpecifiedBPMMin ) ); else f.PutLine( ssprintf( "#DISPLAYBPM:%.6f:%.6f;", out.m_fSpecifiedBPMMin, out.m_fSpecifiedBPMMax ) ); break; - case Song::DISPLAY_RANDOM: + case DISPLAY_BPM_RANDOM: f.PutLine( ssprintf( "#DISPLAYBPM:*;" ) ); break; } diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index b315b74098..801f4aa467 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -539,7 +539,10 @@ static MenuDef g_SongInformation( MenuRowDef( ScreenEdit::main_title_transliteration, "Main title transliteration", true, EditMode_Practice, true, true, 0, NULL ), MenuRowDef( ScreenEdit::sub_title_transliteration, "Sub title transliteration", true, EditMode_Practice, true, true, 0, NULL ), MenuRowDef( ScreenEdit::artist_transliteration, "Artist transliteration", true, EditMode_Practice, true, true, 0, NULL ), - MenuRowDef( ScreenEdit::last_beat_hint, "Last beat hint", true, EditMode_Full, true, true, 0, NULL ) + MenuRowDef( ScreenEdit::last_beat_hint, "Last beat hint", true, EditMode_Full, true, true, 0, NULL ), + MenuRowDef( ScreenEdit::display_bpm, "Display BPM", true, EditMode_Full, true, true, 0, "Actual", "Specified", "Random" ), + MenuRowDef( ScreenEdit::min_bpm, "Min BPM", true, EditMode_Full, true, true, 0, NULL ), + MenuRowDef( ScreenEdit::min_bpm, "Max BPM", true, EditMode_Full, true, true, 0, NULL ) ); static MenuDef g_TimingDataInformation( @@ -2980,6 +2983,16 @@ static void ChangeLastBeatHint( const RString &sNew ) GAMESTATE->m_pCurSong->m_fSpecifiedLastBeat = StringToFloat( sNew ); } +static void ChangeMinBPM( const RString &sNew ) +{ + GAMESTATE->m_pCurSong->m_fSpecifiedBPMMin = StringToFloat( sNew ); +} + +static void ChangeMaxBPM( const RString &sNew ) +{ + GAMESTATE->m_pCurSong->m_fSpecifiedBPMMax = StringToFloat( sNew ); +} + // End helper functions static LocalizedString REVERT_LAST_SAVE ( "ScreenEdit", "Do you want to revert to your last save?" ); @@ -3171,6 +3184,9 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector &iAns g_SongInformation.rows[sub_title_transliteration].SetOneUnthemedChoice( pSong->m_sSubTitleTranslit ); g_SongInformation.rows[artist_transliteration].SetOneUnthemedChoice( pSong->m_sArtistTranslit ); g_SongInformation.rows[last_beat_hint].SetOneUnthemedChoice( ssprintf("%.5f", pSong->m_fSpecifiedLastBeat) ); + g_SongInformation.rows[display_bpm].iDefaultChoice = pSong->m_DisplayBPMType; + g_SongInformation.rows[min_bpm].SetOneUnthemedChoice( ssprintf("%.5f", pSong->m_fSpecifiedBPMMin) ); + g_SongInformation.rows[max_bpm].SetOneUnthemedChoice( ssprintf("%.5f", pSong->m_fSpecifiedBPMMax) ); EditMiniMenu( &g_SongInformation, SM_BackFromSongInformation ); } @@ -3575,13 +3591,15 @@ static LocalizedString ENTER_MAIN_TITLE_TRANSLIT ("ScreenEdit","Enter a new main static LocalizedString ENTER_SUB_TITLE_TRANSLIT ("ScreenEdit","Enter a new sub title transliteration."); static LocalizedString ENTER_ARTIST_TRANSLIT ("ScreenEdit","Enter a new artist transliteration."); static LocalizedString ENTER_LAST_BEAT_HINT ("ScreenEdit","Enter a new last beat hint."); +static LocalizedString ENTER_MIN_BPM ("ScreenEdit","Enter a new min BPM."); +static LocalizedString ENTER_MAX_BPM ("ScreenEdit","Enter a new max BPM."); void ScreenEdit::HandleSongInformationChoice( SongInformationChoice c, const vector &iAnswers ) { Song* pSong = GAMESTATE->m_pCurSong; + pSong->m_DisplayBPMType = static_cast(iAnswers[display_bpm]); switch( c ) { - DEFAULT_FAIL(c); case main_title: ScreenTextEntry::TextEntry( SM_None, ENTER_MAIN_TITLE, pSong->m_sMainTitle, 100, NULL, ChangeMainTitle, NULL ); break; @@ -3607,7 +3625,20 @@ void ScreenEdit::HandleSongInformationChoice( SongInformationChoice c, const vec ScreenTextEntry::TextEntry( SM_None, ENTER_ARTIST_TRANSLIT, pSong->m_sArtistTranslit, 100, NULL, ChangeArtistTranslit, NULL ); break; case last_beat_hint: - ScreenTextEntry::TextEntry( SM_None, ENTER_LAST_BEAT_HINT, ssprintf("%.5f", pSong->m_fSpecifiedLastBeat), 20, ScreenTextEntry::FloatValidate, ChangeLastBeatHint, NULL ); + ScreenTextEntry::TextEntry( SM_None, ENTER_LAST_BEAT_HINT, + ssprintf("%.5f", pSong->m_fSpecifiedLastBeat), 20, + ScreenTextEntry::FloatValidate, ChangeLastBeatHint, NULL ); + break; + case min_bpm: + ScreenTextEntry::TextEntry( SM_None, ENTER_MIN_BPM, + ssprintf("%.5f", pSong->m_fSpecifiedBPMMin), 20, + ScreenTextEntry::FloatValidate, ChangeMinBPM, NULL ); + break; + case max_bpm: + ScreenTextEntry::TextEntry( SM_None, ENTER_MAX_BPM, + ssprintf("%.5f", pSong->m_fSpecifiedBPMMax), 20, + ScreenTextEntry::FloatValidate, ChangeMaxBPM, NULL ); + break; }; } diff --git a/src/ScreenEdit.h b/src/ScreenEdit.h index 1f79b78528..1af4734fc1 100644 --- a/src/ScreenEdit.h +++ b/src/ScreenEdit.h @@ -442,6 +442,9 @@ public: sub_title_transliteration, artist_transliteration, last_beat_hint, + display_bpm, + min_bpm, + max_bpm, NUM_SONG_INFORMATION_CHOICES }; void HandleSongInformationChoice( SongInformationChoice c, const vector &iAnswers ); diff --git a/src/Song.cpp b/src/Song.cpp index 50537a8b97..224fa855bd 100644 --- a/src/Song.cpp +++ b/src/Song.cpp @@ -74,7 +74,7 @@ Song::Song() m_fSpecifiedLastBeat = -1; m_SelectionDisplay = SHOW_ALWAYS; m_bEnabled = true; - m_DisplayBPMType = DISPLAY_ACTUAL; + m_DisplayBPMType = DISPLAY_BPM_ACTUAL; m_fSpecifiedBPMMin = 0; m_fSpecifiedBPMMax = 0; m_bIsSymLink = false; @@ -147,7 +147,7 @@ void Song::AddLyricSegment( LyricSegment seg ) void Song::GetDisplayBpms( DisplayBpms &AddTo ) const { - if( m_DisplayBPMType == DISPLAY_SPECIFIED ) + if( m_DisplayBPMType == DISPLAY_BPM_SPECIFIED ) { AddTo.Add( m_fSpecifiedBPMMin ); AddTo.Add( m_fSpecifiedBPMMax ); @@ -1458,7 +1458,7 @@ bool Song::HasSignificantBpmChangesOrStops() const // Don't consider BPM changes that only are only for maintaining sync as // a real BpmChange. - if( m_DisplayBPMType == DISPLAY_SPECIFIED ) + if( m_DisplayBPMType == DISPLAY_BPM_SPECIFIED ) { if( m_fSpecifiedBPMMin != m_fSpecifiedBPMMax ) return true; @@ -1612,7 +1612,7 @@ public: } static int IsDisplayBpmRandom( T* p, lua_State *L ) { - lua_pushboolean( L, p->m_DisplayBPMType == Song::DISPLAY_RANDOM ); + lua_pushboolean( L, p->m_DisplayBPMType == DISPLAY_BPM_RANDOM ); return 1; } diff --git a/src/Song.h b/src/Song.h index d9b1d18c1f..d8dd4a20ee 100644 --- a/src/Song.h +++ b/src/Song.h @@ -35,6 +35,15 @@ enum BackgroundLayer NUM_BackgroundLayer, BACKGROUND_LAYER_Invalid }; + +/** @brief The different ways of displaying the BPM. */ +enum DisplayBPM +{ + DISPLAY_BPM_ACTUAL, /**< Display the song's actual BPM. */ + DISPLAY_BPM_SPECIFIED, /**< Display a specified value or values. */ + DISPLAY_BPM_RANDOM /**< Display a random selection of BPMs. */ +}; + /** @brief A custom foreach loop for the different background layers. */ #define FOREACH_BackgroundLayer( bl ) FOREACH_ENUM( BackgroundLayer, bl ) @@ -222,7 +231,7 @@ public: float m_fSpecifiedLastBeat; // specified last beat of the song float m_fMusicSampleStartSeconds; float m_fMusicSampleLengthSeconds; - enum { DISPLAY_ACTUAL, DISPLAY_SPECIFIED, DISPLAY_RANDOM } m_DisplayBPMType; + DisplayBPM m_DisplayBPMType; float m_fSpecifiedBPMMin; float m_fSpecifiedBPMMax; // if a range, then Min != Max diff --git a/src/StageStats.cpp b/src/StageStats.cpp index d00c73f80b..df3a500349 100644 --- a/src/StageStats.cpp +++ b/src/StageStats.cpp @@ -47,9 +47,9 @@ void StageStats::AssertValid( PlayerNumber pn ) const ASSERT( m_player[pn].m_vpPossibleSteps[0] ); ASSERT_M( m_playMode < NUM_PlayMode, ssprintf("playmode %i", m_playMode) ); ASSERT( m_pStyle != NULL ); - ASSERT_M( m_player[pn].m_vpPossibleSteps[0]->GetDifficulty() < NUM_Difficulty, ssprintf("difficulty %i", m_player[pn].m_vpPossibleSteps[0]->GetDifficulty()) ); - ASSERT_M( (int) m_vpPlayedSongs.size() == m_player[pn].m_iStepsPlayed, ssprintf("%i, %i, %i", (int)m_vpPlayedSongs.size(), (int)m_player[pn].m_iStepsPlayed, pn) ); - ASSERT_M( m_vpPossibleSongs.size() == m_player[pn].m_vpPossibleSteps.size(), ssprintf("%i, %i, %i", (int)m_vpPossibleSongs.size(), (int)m_player[pn].m_vpPossibleSteps.size(), pn) ); + ASSERT_M( m_player[pn].m_vpPossibleSteps[0]->GetDifficulty() < NUM_Difficulty, ssprintf("Invalid Difficulty %i", m_player[pn].m_vpPossibleSteps[0]->GetDifficulty()) ); + ASSERT_M( (int) m_vpPlayedSongs.size() == m_player[pn].m_iStepsPlayed, ssprintf("%i Songs Played != %i Steps Played for player %i", (int)m_vpPlayedSongs.size(), (int)m_player[pn].m_iStepsPlayed, pn) ); + ASSERT_M( m_vpPossibleSongs.size() == m_player[pn].m_vpPossibleSteps.size(), ssprintf("%i Possible Songs != %i Possible Steps for player %i", (int)m_vpPossibleSongs.size(), (int)m_player[pn].m_vpPossibleSteps.size(), pn) ); } void StageStats::AssertValid( MultiPlayer pn ) const diff --git a/src/TimingData.cpp b/src/TimingData.cpp index 0fa5d50889..0c22562f9f 100644 --- a/src/TimingData.cpp +++ b/src/TimingData.cpp @@ -92,17 +92,16 @@ void TimingData::SetStopAtRow( int iRow, float fSeconds, bool bDelay ) if( i == m_StopSegments.size() ) // there is no Stop/Delay Segment at the current beat { // create a new StopSegment - if( fSeconds > 0 || PREFSMAN->m_bQuirksMode ) + if( fSeconds > 0 ) { AddStopSegment( StopSegment(iRow, fSeconds, bDelay) ); } } else // StopSegment being modified is m_StopSegments[i] { - if( fSeconds > 0 || PREFSMAN->m_bQuirksMode ) + if( fSeconds > 0 ) { m_StopSegments[i].m_fStopSeconds = fSeconds; - //m_StopSegments[i].m_bDelay = bDelay; // use this? } else m_StopSegments.erase( m_StopSegments.begin()+i, m_StopSegments.begin()+i+1 ); diff --git a/src/Trail.cpp b/src/Trail.cpp index bbd54bf4bc..073d266c93 100644 --- a/src/Trail.cpp +++ b/src/Trail.cpp @@ -189,11 +189,11 @@ void Trail::GetDisplayBpms( DisplayBpms &AddTo ) const ASSERT( pSong ); switch( pSong->m_DisplayBPMType ) { - case Song::DISPLAY_ACTUAL: - case Song::DISPLAY_SPECIFIED: + case DISPLAY_BPM_ACTUAL: + case DISPLAY_BPM_SPECIFIED: pSong->GetDisplayBpms( AddTo ); break; - case Song::DISPLAY_RANDOM: + case DISPLAY_BPM_RANDOM: AddTo.Add( -1 ); break; DEFAULT_FAIL( pSong->m_DisplayBPMType );