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 |
|
Flamefire
|
46c3353e08
|
Add better border and alignment handling
|
2014-09-13 17:44:46 +02:00 |
|
Flamefire
|
9fce9fe962
|
Faster rendering (most draw calls are without bounds)
Fix for D3D
|
2014-09-13 16:19:25 +02:00 |
|
Flamefire
|
128abf61b9
|
Fix initial resize of OGL
|
2014-09-13 01:22:56 +02:00 |
|
Flamefire
|
4a068f113e
|
Fix missing null check
|
2014-09-13 01:22:42 +02:00 |
|
Flamefire
|
0796cbaef8
|
Workaround for Font bug
|
2014-09-13 01:22:05 +02:00 |
|
Flamefire
|
76ededf9f3
|
Unify as much of D3D and OpenGL as possible
|
2014-09-11 21:58:30 +02:00 |
|
Flamefire
|
46acaf092a
|
Make a common base class for CD3D and COpenGL
|
2014-09-11 10:59:50 +02:00 |
|
Flamefire
|
ad18bec52c
|
Improve CTexture and Drawing stuff related to that
(Don't use an ID queue, store DataSizes of texture data)
|
2014-09-10 20:58:35 +02:00 |
|
Flamefire
|
93a7e70ca3
|
Add Assertions for empty fontName
Simplify Dispose of fonts
Check for existing fonts when none found
|
2014-09-10 18:10:34 +02:00 |
|
Flamefire
|
6c7b59ed44
|
Adapt to changed usage of CFonts
|
2014-09-10 17:50:30 +02:00 |
|
Flamefire
|
eaa709813d
|
Merge branch 'Font_Rewrite' into Automatic_Covers
|
2014-09-10 17:19:25 +02:00 |
|
Flamefire
|
e9b584d84c
|
Show an error if no profiles found and disable gaming
|
2014-09-07 19:33:28 +02:00 |
|
Flamefire
|
64c142345b
|
Disable Buttons also deselects it
|
2014-09-07 19:31:57 +02:00 |
|
Flamefire
|
d327f22741
|
Fix wrong colors
|
2014-09-07 19:30:52 +02:00 |
|
Flamefire
|
774035e886
|
Make GetProfiles return an empty array in case of no profiles
|
2014-09-07 12:11:42 +02:00 |
|
Flamefire
|
e66d108df0
|
Handle errors in profile files
|
2014-09-07 11:11:16 +02:00 |
|
Flamefire
|
445d50bcaf
|
Merge branch 'develop' into Font_Rewrite
|
2014-09-07 10:49:21 +02:00 |
|
Flamefire
|
a5ddeeee95
|
Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into develop
|
2014-09-07 10:37:37 +02:00 |
|
Flamefire
|
94be5ce97b
|
Use CFont class to define the font to use
|
2014-09-07 10:35:41 +02:00 |
|
Flamefire
|
7f60e6f321
|
First Step to make CFonts threadsave
|
2014-09-06 14:17:27 +02:00 |
|
Flamefire
|
32241a91dc
|
Restructure and simplify Font loading
|
2014-09-06 12:57:40 +02:00 |
|
Flamefire
|
9f8dfaa50c
|
Add range checks in XMLReader
|
2014-09-06 12:48:56 +02:00 |
|
Flamefire
|
b634fb98f9
|
Add more options and improve splitting of text
|
2014-08-24 20:07:15 +02:00 |
|
Flamefire
|
3f4f2776be
|
Add first working implementation of the cover generator
TODO: Speedup
|
2014-08-14 16:07:49 +02:00 |
|
Flamefire
|
388bd6310f
|
Add GetSong to Categories
|
2014-08-14 16:07:06 +02:00 |
|
Flamefire
|
d20c31ef71
|
Add additional logging functionality
|
2014-08-14 16:06:43 +02:00 |
|
Flamefire
|
43fff7f52f
|
Rename FileName to FilePath
|
2014-08-14 16:03:09 +02:00 |
|
Flamefire
|
8f60d5dae5
|
Rename LoadCover function
|
2014-08-10 14:35:02 +02:00 |
|
Flamefire
|
cbc3223114
|
Remove loading of Covers from xml
|
2014-08-10 14:30:18 +02:00 |
|
Flamefire
|
41480797e2
|
Change values of xml argument to xPath only to make it more consistent
|
2014-08-09 19:49:20 +02:00 |
|
Flamefire
|
f7202ee9b0
|
Rename covers to match correct name and remove them from style file
|
2014-08-09 19:48:47 +02:00 |
|
Flamefire
|
a868f02794
|
Extract CVideoPlayer.cs
|
2014-08-09 18:59:28 +02:00 |
|
Flamefire
|
4b348ceec6
|
Don't show old preview song in category view
|
2014-08-09 17:59:53 +02:00 |
|
Flamefire
|
f021e9a9f7
|
Unify language of songs
|
2014-08-09 17:59:15 +02:00 |
|
Flamefire
|
48527a4061
|
Fix missing songs in categories
|
2014-08-09 17:58:49 +02:00 |
|
Flamefire
|
ced12ac064
|
Fix NPE with few songs in category
|
2014-08-09 15:27:05 +02:00 |
|
Flamefire
|
09d36ccf60
|
Fix categories not showing on start
|
2014-08-09 15:05:34 +02:00 |
|
Flamefire
|
62675821ed
|
Enable hiding the Server QR-Code Popup
|
2014-08-09 14:35:03 +02:00 |
|
Flamefire
|
51a5165308
|
Fix Server
|
2014-08-09 14:34:34 +02:00 |
|
Flamefire
|
75ff5a0291
|
Remove redundant names in playlist functions
Fix handling of playlist IDs
|
2014-08-08 23:49:01 +02:00 |
|
Flamefire
|
10e5312579
|
Fix crash on closing a sound stream
|
2014-08-08 20:04:50 +02:00 |
|
Flamefire
|
b14b47fd33
|
Fix wrong song name showing in party mode
|
2014-08-08 20:01:39 +02:00 |
|
Flamefire
|
d5ae52a8f7
|
Fix crash at song end
|
2014-08-08 17:50:41 +02:00 |
|