Implemented palette sorting. There are problems as we're sortig with HSL color system and the rgb2hl function doesn't return s... we'll have to add that as we can't say if we're looking at red or grey (both have H=0).

Also, there is a problem with the makefile under linux. The .dep is set for checking the .o in the win32 folder. It still works but recompiles everything at each change.

Also added a button to enable HSL color editing in the palette screen. We'll need a hls2rgb function, and some other tweaks and reworks to the palette screen.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@290 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues
2008-10-19 18:52:10 +00:00
parent 4a3b324a52
commit fc41bbe89d
5 changed files with 152 additions and 90 deletions

View File

@@ -1,44 +1,44 @@
obj/win32/SFont.o: SFont.c SFont.h
obj/win32/aide.o: aide.c const.h struct.h global.h loadsave.h divers.h graph.h \
$(OBJDIR)/SFont.o: SFont.c SFont.h
$(OBJDIR)/aide.o: aide.c const.h struct.h global.h loadsave.h divers.h graph.h \
moteur.h tables_aide.h aide.h sdlscreen.h
obj/win32/boutons.o: boutons.c const.h struct.h global.h loadsave.h divers.h \
$(OBJDIR)/boutons.o: boutons.c const.h struct.h global.h loadsave.h divers.h \
graph.h moteur.h readline.h files.h init.h boutons.h operatio.h pages.h \
erreurs.h readini.h saveini.h shade.h io.h aide.h sdlscreen.h
obj/win32/clavier.o: clavier.c global.h struct.h const.h loadsave.h
obj/win32/divers.o: divers.c struct.h const.h sdlscreen.h global.h loadsave.h \
$(OBJDIR)/clavier.o: clavier.c global.h struct.h const.h loadsave.h
$(OBJDIR)/divers.o: divers.c struct.h const.h sdlscreen.h global.h loadsave.h \
graph.h erreurs.h boutons.h moteur.h divers.h clavier.h
obj/win32/files.o: files.c const.h struct.h global.h loadsave.h graph.h divers.h \
$(OBJDIR)/files.o: files.c const.h struct.h global.h loadsave.h graph.h divers.h \
erreurs.h linux.h
obj/win32/gfxcfg.o: gfxcfg.c SFont.h struct.h const.h clavier.h io.h hotkeys.h
obj/win32/graph.o: graph.c sdlscreen.h struct.h const.h graph.h divers.h moteur.h \
$(OBJDIR)/gfxcfg.o: gfxcfg.c SFont.h struct.h const.h clavier.h io.h hotkeys.h
$(OBJDIR)/graph.o: graph.c sdlscreen.h struct.h const.h graph.h divers.h moteur.h \
boutons.h pages.h global.h loadsave.h erreurs.h
obj/win32/init.o: init.c const.h struct.h global.h loadsave.h graph.h boutons.h \
$(OBJDIR)/init.o: init.c const.h struct.h global.h loadsave.h graph.h boutons.h \
palette.h aide.h operatio.h divers.h erreurs.h clavier.h io.h hotkeys.h
obj/win32/io.o: io.c struct.h const.h io.h
obj/win32/linux.o: linux.c
obj/win32/loadsave.o: loadsave.c const.h struct.h global.h loadsave.h graph.h \
$(OBJDIR)/io.o: io.c struct.h const.h io.h
$(OBJDIR)/linux.o: linux.c
$(OBJDIR)/loadsave.o: loadsave.c const.h struct.h global.h loadsave.h graph.h \
divers.h pages.h op_c.h boutons.h erreurs.h linux.h io.h sdlscreen.h
obj/win32/main.o: main.c const.h struct.h global.h loadsave.h graph.h divers.h \
$(OBJDIR)/main.o: main.c const.h struct.h global.h loadsave.h graph.h divers.h \
init.h boutons.h moteur.h pages.h files.h sdlscreen.h erreurs.h \
readini.h saveini.h linux.h io.h
obj/win32/moteur.o: moteur.c const.h struct.h global.h loadsave.h graph.h divers.h \
$(OBJDIR)/moteur.o: moteur.c const.h struct.h global.h loadsave.h graph.h divers.h \
special.h boutons.h operatio.h shade.h erreurs.h linux.h sdlscreen.h
obj/win32/op_c.o: op_c.c op_c.h struct.h const.h erreurs.h
obj/win32/operatio.o: operatio.c const.h struct.h global.h loadsave.h divers.h \
$(OBJDIR)/op_c.o: op_c.c op_c.h struct.h const.h erreurs.h
$(OBJDIR)/operatio.o: operatio.c const.h struct.h global.h loadsave.h divers.h \
moteur.h graph.h operatio.h boutons.h pages.h erreurs.h
obj/win32/pages.o: pages.c global.h struct.h const.h loadsave.h pages.h graph.h \
$(OBJDIR)/pages.o: pages.c global.h struct.h const.h loadsave.h pages.h graph.h \
erreurs.h linux.h
obj/win32/palette.o: palette.c const.h struct.h global.h loadsave.h divers.h \
$(OBJDIR)/palette.o: palette.c const.h struct.h global.h loadsave.h divers.h \
graph.h moteur.h readline.h boutons.h pages.h aide.h sdlscreen.h
obj/win32/readini.o: readini.c const.h global.h struct.h loadsave.h graph.h
obj/win32/readline.o: readline.c const.h struct.h global.h loadsave.h graph.h \
$(OBJDIR)/readini.o: readini.c const.h global.h struct.h loadsave.h graph.h
$(OBJDIR)/readline.o: readline.c const.h struct.h global.h loadsave.h graph.h \
divers.h erreurs.h linux.h sdlscreen.h
obj/win32/saveini.o: saveini.c const.h global.h struct.h loadsave.h readini.h \
$(OBJDIR)/saveini.o: saveini.c const.h global.h struct.h loadsave.h readini.h \
files.h erreurs.h graph.h
obj/win32/sdlscreen.o: sdlscreen.c global.h struct.h const.h loadsave.h sdlscreen.h \
$(OBJDIR)/sdlscreen.o: sdlscreen.c global.h struct.h const.h loadsave.h sdlscreen.h \
divers.h erreurs.h graph.h
obj/win32/shade.o: shade.c global.h struct.h const.h loadsave.h graph.h moteur.h \
$(OBJDIR)/shade.o: shade.c global.h struct.h const.h loadsave.h graph.h moteur.h \
divers.h readline.h aide.h sdlscreen.h
obj/win32/special.o: special.c const.h struct.h global.h loadsave.h graph.h \
$(OBJDIR)/special.o: special.c const.h struct.h global.h loadsave.h graph.h \
moteur.h
obj/win32/version.o: version.c
$(OBJDIR)/version.o: version.c