mergefix

monkstone · monkstone · commit ad5cd9c28f1c · 2017-04-02T13:07:27.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 
-**v0.9.2** Bump processing version, removed audio, refactored color, including export to ruby string.
+**v0.9.2** Bump processing version, add `to_ruby_string` method to `ColorList` see examples, allow use of `TColor` without `Toxi` prefix. Removed audio. 
 
 **v0.9.1** Make it easier to load PerlinNoise and SimplexNoise
 
diff --git a/lib/toxiclibs.rb b/lib/toxiclibs.rb
@@ -83,6 +83,8 @@ module Gfx
   TVec2D = Toxi::Vec2D
   TVec3D = Toxi::Vec3D
   AABB = Toxi::AABB
+  # alias Toxi::TColor
+  TColor = Toxi::TColor
   volume = %w(AdditiveBrush ArrayIsoSurface BoxBrush BrushMode HashIsoSurface
               IsoSurface MarchingCubesIndex MeshLatticeBuilder MeshVoxelizer
               MultiplyBrush PeakBrush ReplaceBrush RoundBrush VolumetricBrush

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-v0.9.2 Bump processing version, removed audio, refactored color, including export to ruby string.`
	`2`	+v0.9.2 Bump processing version, add `to_ruby_string` method to `ColorList` see examples, allow use of `TColor` without `Toxi` prefix. Removed audio.
`3`	`3`
`4`	`4`	`v0.9.1 Make it easier to load PerlinNoise and SimplexNoise`
`5`	`5`