sscharter 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b443058a8c165c9e2e9823dce2cbaab8622228887f3b770ff36321b74f47330a
-  data.tar.gz: 993b5b60083b993f73f0d30cd2761a95d28a11dbbb506c4fc6cdc9aee3a6dad9
+  metadata.gz: 1695717274c0888590e92f6a3dabf86fca4a2d34aaad9f17dc9a88ab20311207
+  data.tar.gz: 78096695809b63551d5f48a3c11d4120ead84157c1146b4064a9f8f1262b66c7
 SHA512:
-  metadata.gz: 384e2575a1c8d4cae67cf0f704187a57af7569dce8abf43ae83f7301e8fec21d49cd705906c83c3cab62a9c76d8ccf9eb885850475163cb60e5bb79a6882b29b
-  data.tar.gz: fbcc4a360796d207427dedc4d9c9ff9d0a0b58773d39cbd975fefd28ab8a80db3597cf317e0b50e6714204d2c4f10cf9861121275ffb185cedc8a9d6a8161b30
+  metadata.gz: 8e64530c4c426710eae970e9bd7fd4609d307a75102cdea4920f9ed5ae8208313cc48efae86c545b95cdecaec79e6da6738d92d5db1f8861ea142b3f2b843c88
+  data.tar.gz: 64725aa5bf3336f3ab3965f583cf4ed80e02296a18a1be9c1427542d9bc79164b602f99b19a2c7f45e243d32e8456911940971ffd3794e8027ec6e4db17d5221

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sscharter (0.6.1)
+    sscharter (0.7.0)
       concurrent-ruby (~> 1.3)
       em-websocket (~> 0.5)
       filewatcher (~> 2.0)
@@ -14,7 +14,7 @@ GEM
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
@@ -24,7 +24,7 @@ GEM
     http_parser.rb (0.8.0)
     launchy (2.5.2)
       addressable (~> 2.8)
-    minitest (5.24.1)
+    minitest (5.25.1)
     module_methods (0.1.0)
     public_suffix (6.0.1)
     rake (13.2.1)

data/lib/sscharter/version.rb

@@ -2,6 +2,6 @@
 
 module Sunniesnow
 	class Charter
-		VERSION = "0.6.1"
+		VERSION = "0.7.0"
 	end
 end

data/lib/sscharter.rb

@@ -324,6 +324,7 @@ class Sunniesnow::Charter
 		@name = name
 		init_chart_info
 		init_state
+		init_bookmarks
 	end
 
 	def init_chart_info
@@ -337,8 +338,11 @@ class Sunniesnow::Charter
 		@events = []
 	end
 
+	def init_bookmarks
+		@bookmarks = {}
+	end
+
 	def init_state
-		@current_offset = nil
 		@current_beat = nil
 		@bpm_changes = nil
 		@tip_point_mode_stack = [:none]
@@ -399,9 +403,8 @@ class Sunniesnow::Charter
 
 	def offset offset
 		raise ArgumentError, 'offset must be a number' unless offset.is_a? Numeric
-		@current_offset = offset.to_f
 		@current_beat = 0r
-		@bpm_changes = BpmChangeList.new @current_offset
+		@bpm_changes = BpmChangeList.new offset.to_f
 	end
 
 	def bpm bpm
@@ -449,27 +452,72 @@ class Sunniesnow::Charter
 		alias_method "tp_#{mode}", "tip_point_#{mode}"
 	end
 
+	def backup_beat
+		{current_beat: @current_beat, bpm_changes: @bpm_changes}
+	end
+
+	def restore_beat backup
+		@current_beat = backup[:current_beat]
+		@bpm_changes = backup[:bpm_changes]
+	end
+
 	def group preserve_beat: true, &block
 		raise ArgumentError, 'no block given' unless block
 		@groups.push result = []
-		unless preserve_beat
-			last_beat = @current_beat
-			last_offset = @current_offset
-			last_bpm_changes = @bpm_changes
-		end
+		beat_backup = backup_beat unless preserve_beat
 		instance_eval &block
-		unless preserve_beat
-			@current_beat = last_beat
-			@current_offset = last_offset
-			@bpm_changes = last_bpm_changes
-		end
+		restore_beat beat_backup unless preserve_beat
 		@groups.delete_if { result.equal? _1 }
 		result
 	end
 
+	def backup_state
+		{
+			current_beat: @current_beat,
+			bpm_changes: @bpm_changes,
+			tip_point_mode_stack: @tip_point_mode_stack.dup,
+			current_tip_point_stack: @current_tip_point_stack.dup,
+			current_tip_point_group_stack: @current_tip_point_group_stack.dup,
+			current_duplicate: @current_duplicate,
+			tip_point_start_to_add_stack: @tip_point_start_to_add_stack.dup,
+			groups: @groups.dup
+		}
+	end
+
+	def restore_state backup
+		@current_beat = backup[:current_beat]
+		@bpm_changes = backup[:bpm_changes]
+		@tip_point_mode_stack = backup[:tip_point_mode_stack]
+		@current_tip_point_stack = backup[:current_tip_point_stack]
+		@current_tip_point_group_stack = backup[:current_tip_point_group_stack]
+		@current_duplicate = backup[:current_duplicate]
+		@tip_point_start_to_add_stack = backup[:tip_point_start_to_add_stack]
+		@groups = backup[:groups]
+		nil
+	end
+
+	def mark name
+		@bookmarks[name] = backup_state
+		name
+	end
+
+	def at name, preserve_beat: false, update_mark: false, &block
+		raise ArgumentError, 'no block given' unless block
+		raise ArgumentError, "unknown bookmark #{name}" unless bookmark = @bookmarks[name]
+		backup = backup_state
+		restore_state bookmark
+		result = group &block
+		mark name if update_mark
+		beat_backup = backup_beat if preserve_beat
+		restore_state backup
+		restore_beat beat_backup if preserve_beat
+		result
+	end
+
 	def tip_point mode, *args, preserve_beat: true, **opts, &block
 		@tip_point_mode_stack.push mode
 		if mode == :none
+			@tip_point_start_to_add_stack.push nil
 			@current_tip_point_stack.push nil
 		else
 			@tip_point_start_to_add_stack.push TipPointStart.new *args, **opts
@@ -488,7 +536,7 @@ class Sunniesnow::Charter
 	end
 
 	def remove *events
-		events.each { @events.delete _1 }
+		events.each { |event| @groups.each { _1.delete event } }
 	end
 
 	def event type, duration_beats = nil, **properties
@@ -659,4 +707,31 @@ class Sunniesnow::Charter
 		"#<Sunniesnow::Charter #@name>"
 	end
 
+	def check(
+		notes_in_bound: true,
+		bg_notes_in_bound: true
+	)
+		out_of_bound_events = [] if notes_in_bound || bg_notes_in_bound
+		@events.each do |event|
+			if %i[tap hold drag flick].include?(event.type) && notes_in_bound || event.type == :bg_note && bg_notes_in_bound
+				if event[:x] < -100-1e-10 || event[:x] > 100+1e-10 || event[:y] < -50-1e-10 || event[:y] > 50+1e-10
+					out_of_bound_events.push event
+				end
+			end
+		end
+		if notes_in_bound || bg_notes_in_bound
+			if out_of_bound_events.empty?
+				puts "===== All notes are in bound ====="
+			else
+				puts "===== Out-of-bound notes ====="
+				out_of_bound_events.each do |event|
+					p event
+					puts "at time #{event.time}"
+					puts 'defined at:'
+					puts event.backtrace
+				end
+			end
+		end
+	end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sscharter
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Ulysses Zhan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-04 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip