Flamefire
e01bd5da81
Remove not required covers
2014-10-23 17:14:49 +02:00
Flamefire
8ae1ff3e57
Move enum to enums
2014-10-23 17:06:44 +02:00
Flamefire
fe07a2f926
Generate Covers for songs
2014-10-23 17:05:57 +02:00
Flamefire
0a48c6b74b
Rename CoverGenerator
2014-10-23 17:05:42 +02:00
Flamefire
a51e7c5698
Rename Lyric.SelColor to Lyric.ProcessedColor
2014-10-23 00:48:52 +02:00
Flamefire
10c456cbff
Unify name of selected color to SelColor
2014-10-23 00:39:57 +02:00
Flamefire
714b28294f
Remove unnecessary tags from themes
2014-10-23 00:30:44 +02:00
Flamefire
2f99cd2560
Make CSingNotes also implement Draw()
...
Also a bit refactoring
2014-10-22 22:00:25 +02:00
Flamefire
6bf8a5d64c
Draw highlighted element
2014-10-22 13:49:41 +02:00
Flamefire
67d081d1c1
Draw background like all other elements
...
Few fixes
2014-10-22 13:47:26 +02:00
Flamefire
8c3a50c18f
More improvements for objectinteractions
...
Also removes highlight textures and colors
2014-10-22 13:46:34 +02:00
Flamefire
d910b944ea
Add error check on prescan of gstreamer audio
2014-10-19 18:51:39 +02:00
Flamefire
d208f9d7b9
Reformatting
...
Also adds license headers
2014-10-19 18:51:14 +02:00
Flamefire
4c7013836b
Move non-drawing stuff out of Draw methods
2014-10-19 18:37:16 +02:00
Flamefire
432ff4f4f3
Use basic Draw method in ScreenCredits and fix error when shown multiple times
2014-10-19 18:18:50 +02:00
Flamefire
60962e382b
Deny changing anything by mouse in songmenu if the options dialog is shown
2014-10-19 17:40:57 +02:00
Flamefire
e7d1febe4b
Fix Drag&Drop
2014-10-19 17:32:03 +02:00
Flamefire
ae7a7fd390
Implement a common Interface for all MenuElements
...
Also remove CSongMenu and replace it with a factory class
2014-10-19 17:17:39 +02:00
Flamefire
9479f3b3ff
Re-add staticScore
2014-10-19 13:32:32 +02:00
Flamefire
63fc406735
More unification of menuelements and fix for screensing theme
2014-10-18 20:46:51 +02:00
Flamefire
1b4f3ced7d
Fix theme issues
2014-10-18 18:46:23 +02:00
Flamefire
b07d31f697
Unify object interactions
2014-10-18 18:46:13 +02:00
Flamefire
d8cce13211
Rename LoadTextures to LoadSkin
...
(Its also Colors, not only textures!)
2014-10-18 10:42:35 +02:00
Flamefire
9a699f4cb5
Remove PlayerNDimM
2014-10-17 00:17:49 +02:00
Flamefire
38a19b6adb
Allow incomplete colors
2014-10-16 23:57:23 +02:00
Flamefire
13fa20a517
Cancel auto cover creation on shutdown
2014-10-16 23:55:55 +02:00
Flamefire
8109d77ab1
Fix wrong theme stuff
2014-10-16 23:47:52 +02:00
Flamefire
3f76d039b6
Change color representation
...
Allow missing ARGB values (defaults to 1)
Allow Name+ARGB to easily overwrite some values
2014-10-16 22:40:18 +02:00
Flamefire
87f3271046
Remove copy constructors for structs
2014-10-16 21:38:22 +02:00
Flamefire
e04480171e
Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into develop
2014-10-16 21:28:14 +02:00
Flamefire
86fb73ca48
Cleanup not required XML attributes
2014-10-16 21:27:09 +02:00
Flamefire
f01005ea60
Add changelog for skinsystem
2014-10-16 21:05:31 +02:00
Flamefire
b8bd9bf87b
Fix exception on shutdown
...
Improve error handling during shutdown
2014-10-16 19:08:20 +02:00
Flamefire
2371eb4344
Refactor theme system
2014-10-16 19:00:41 +02:00
Flamefire
c45b18d133
Fix missing avatar
2014-10-15 18:05:50 +02:00
Flamefire
98601bd7b1
Partially revert commit and fix wrong partymode table for good
2014-10-15 17:57:15 +02:00
Flamefire
b988d5f0fe
Remove invisible skin
2014-10-15 17:52:03 +02:00
Flamefire
aa0579a4f1
Make partymodes reload their themes
...
Move PartyModeIds into Partymodes
Fix bug where wrong text size is used (CalculatedFont is now used)
Fix bug where text of the main table in partymodes is displayed wrong
2014-10-15 17:25:37 +02:00
Flamefire
5d28b19066
Add partymode path as constructor param
2014-10-15 15:43:48 +02:00
Flamefire
e119e46c5a
Improve partymode loading (return bool instead of incomplete PM)
2014-10-15 15:32:16 +02:00
Flamefire
c1866c0ad5
Add checking for required elements
2014-10-10 02:03:07 +02:00
Flamefire
4efd670747
Move and Rename reading of SColorF
2014-10-09 23:27:32 +02:00
Flamefire
a2720c2108
Rename Partymode themes to fit new default style
2014-10-08 22:47:48 +02:00
Flamefire
b7ca304322
Fix Color description in Theme
...
Fix typo
Allow loading themes from file multiple times (e.g. for party modes)
2014-10-08 22:39:48 +02:00
Flamefire
ae8a3c61d5
Fix disposed exception on disposing a texture
2014-10-08 22:29:22 +02:00
Flamefire
defb2ca6c7
Rewrite Theme Engine
2014-10-08 22:29:02 +02:00
Flamefire
9e5011374f
Rename CTheme to CThemes
2014-10-05 17:27:45 +02:00
Flamefire
355d7b4b5f
Merge branch 'develop' into Better_Graphics_Handling
...
Conflicts:
VocaluxeLib/Menu/CNameSelection.cs
VocaluxeLib/Menu/CPlaylist.cs
VocaluxeLib/Menu/CText.cs
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
VocaluxeLib/Structs.cs
VocaluxeLib/VocaluxeLib.csproj
VocaluxeLib/Xml/CXMLReader.cs
2014-10-05 15:09:52 +02:00
Flamefire
6a3bf7b2c0
Introduce CVideoStream for easier video handling (already includes a texture, important for common usage of streams)
2014-10-05 14:20:57 +02:00
Flamefire
89e528c2a6
Factor out CSkin class
...
Replace usages of GetColor and remove GetColor(..., skinIndex,...)
2014-10-05 13:36:11 +02:00
Flamefire
1c884f3acb
Rename Unload to Close to match Init-Close pattern
2014-10-04 11:17:56 +02:00
Flamefire
31863a7788
Speed up slideshow loading
2014-10-04 11:15:37 +02:00
Flamefire
54f97a4928
Fix artifacts on NPOT textures in OGL
...
Fix reuse check of textures
Introduce Size field for textures (replacing W2, H2)
2014-10-04 10:44:48 +02:00
Flamefire
719c73e6d3
Remove regions
...
Fix MatrixUsage for rectReflection in OGL
2014-10-04 09:08:36 +02:00
Flamefire
4e17745be0
Fix wrong centering of window
2014-10-04 08:59:53 +02:00
Flamefire
2d99bbd2ed
Move Texture handling to new base class
2014-10-04 08:51:25 +02:00
Flamefire
2e25bf6610
Merge branch 'Better_Graphics_Handling' into develop
...
Conflicts:
Vocaluxe/Base/Fonts/CFontStyle.cs
2014-10-02 20:46:04 +02:00
Flamefire
f1c89b9a8e
Merge branch 'Automatic_Covers' into develop
...
Conflicts:
Vocaluxe/Base/CBackgroundMusic.cs
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
2014-10-02 20:43:17 +02:00
Flamefire
6ebbf7df6f
Introduce example for a more flexible deserialization
...
Also make the CoverGenerator themes serializeable
Rest is automatic reformatting.
2014-10-01 00:54:04 +02:00
Flamefire
94d3bed471
Move same methods to base class
2014-09-27 16:56:37 +02:00
Flamefire
158117ce31
Use texture alignment to reduce artifacts
2014-09-27 16:50:00 +02:00
Flamefire
b48cfa8e77
Handle drawing with bounds in one place
...
Also reduces drawing code a lot...
2014-09-27 14:09:36 +02:00
Flamefire
19f81943d6
Introduce RenderRect for easy access to the full screen rect
2014-09-26 15:05:19 +02:00
Flamefire
25653ee55f
Revert "Remove bounds from DrawTextureReflection because it was never used"
...
This reverts commit f5f1a91481 .
Conflicts:
Vocaluxe/Base/CMain.cs
Vocaluxe/Screens/CScreenSing.cs
VocaluxeLib/IBasic.cs
VocaluxeLib/Menu/CStatic.cs
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
2014-09-26 15:04:08 +02:00
Flamefire
125be98466
Actually dispose queued Bitmaps
2014-09-25 20:07:30 +02:00
Flamefire
467b619f0a
Create covers in a task
2014-09-25 20:04:08 +02:00
Flamefire
aff7f42c68
Factor out a few functions (GetCover was tooooo big)
...
Make it return a bitmap (preparation for next step)
2014-09-25 19:59:16 +02:00
Flamefire
2a79f778e6
remove test
2014-09-25 19:43:28 +02:00
Flamefire
dd1231ad34
Merge branch 'Better_Graphics_Handling' into Automatic_Covers
...
Conflicts:
Vocaluxe/Base/CCover.cs
Vocaluxe/Base/CGraphics.cs
Vocaluxe/Base/Fonts/CFontStyle.cs
Vocaluxe/Base/Fonts/CGlyph.cs
VocaluxeLib/Menu/CText.cs
VocaluxeLib/Structs.cs
2014-09-25 19:43:21 +02:00
Flamefire
0611148ec4
Handle gstreamer audio init better
2014-09-25 19:11:03 +02:00
Flamefire
c156fa69ab
Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into Better_Graphics_Handling
...
Conflicts:
Vocaluxe/COSFunctions.cs
VocaluxeLib/CHelper.cs
VocaluxeLib/Menu/CStatic.cs
VocaluxeLib/Structs.cs
2014-09-25 18:49:18 +02:00
Flamefire
5364787599
Resize enqueued bmp update in a task
2014-09-25 16:37:48 +02:00
Flamefire
a06e5066e9
Fix bug with removing a removed texture reference
2014-09-25 16:22:49 +02:00
Flamefire
f0b227798e
Increase speed of cover loading
2014-09-25 16:22:29 +02:00
Flamefire
3bce89eecf
Fix locking
2014-09-25 13:06:20 +02:00
Flamefire
bf7eec4233
Use Resize function in CoverLoader
...
Add possible multithreading
2014-09-25 12:55:00 +02:00
Flamefire
879176a87f
Rename SetRect to something more appropriate and tune it
2014-09-25 12:15:18 +02:00
Flamefire
2ba5f9ee7f
Add another benchmark entry and correct one
2014-09-24 19:15:04 +02:00
Flamefire
bb146b66a3
Fix wrong position of drawing area
2014-09-24 19:05:51 +02:00
Flamefire
926dda7350
Remove DrawLines (was not working in D3D and can actually be replaced by narrow DrawRects)
2014-09-24 18:54:58 +02:00
Flamefire
538eab9516
Add Assertions for color values and fix some wrong ones
2014-09-24 16:52:11 +02:00
Flamefire
cc7d8058e2
Move extension methods to Extensions.cs
...
Add IsInRange function
2014-09-24 16:40:45 +02:00
Flamefire
db4096d57f
Improve background drawing
...
Don't convert to RectangleF for rescaling
Add function for colored fitting of a texture in bounds
Add DrawLine in IDrawing
2014-09-24 16:36:18 +02:00
Flamefire
5f139467ea
Make sure we actually add the data to a queued texture
2014-09-24 15:52:38 +02:00
Flamefire
466c443a20
Fix race condition when getting the loader task
2014-09-24 15:33:24 +02:00
Flamefire
649f81494e
Fix some race conditions with the texture references
...
Add queuing of files
Split CEncoding to separate file
2014-09-23 21:37:46 +02:00
Flamefire
1121261a4a
Resize textures based on its area rather than on its width and Height
...
(No need for 2048*2048 textures on a 1280*720 rendering area and also no need to resize a 1280*720 texture to 1024*1024)
2014-09-22 17:32:58 +02:00
Flamefire
d1e9fbaff1
Add extension methods for bitmap GetSize and GetRect
2014-09-22 16:27:00 +02:00
Flamefire
016b7627d1
Fix for possible error with mirrored texture drawing
2014-09-22 15:55:48 +02:00
Flamefire
f5f1a91481
Remove bounds from DrawTextureReflection because it was never used
2014-09-22 15:55:31 +02:00
Flamefire
c9c907e3f0
Add more queue and update functions
...
Add CopyTexture function
Document CDraw
2014-09-22 15:08:45 +02:00
Flamefire
be67b039d6
Unify and improve texture updating (Do not create new references)
2014-09-20 17:17:34 +02:00
Flamefire
632b90a0e3
Unify Texture data writing
2014-09-20 15:30:48 +02:00
Flamefire
4d197bda9a
Remove PBO
...
It was not used correctly and is actually not really required so save the time fixing it...
2014-09-20 15:09:23 +02:00
Flamefire
1ce085b49f
Use better references to a single texture and unify more stuff
...
Also encapsulate everything graphic related in the Texture classes and not in the references
2014-09-20 00:50:04 +02:00
Flamefire
cfb6d09d06
Fix typo (leading to graphics bug)
2014-09-15 18:02:55 +02:00
Flamefire
3075006799
Add cache for loaded bitmaps (reduces amount of duplicate textures)
2014-09-13 18:11:08 +02:00
Flamefire
37aa8e5219
Remove textures with no references
2014-09-13 17:58:59 +02:00
Flamefire
7f8e974fe1
Rename CTexture to CTextureRef to reflect it is only a reference
2014-09-13 17:51:55 +02:00
Flamefire
3fe8cdf05c
Workaround for OGL bug
2014-09-13 17:49:21 +02:00