From ba9b6750d54e0dd1be7c1108cefb8734880bcaf0 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Wed, 15 Oct 2025 13:58:56 +0000 Subject: [PATCH] better layout git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@343 b9cfdab3-6d41-4d17-bbe4-086880011989 --- GNUmakefile | 8 ++++---- examples/{ => basic}/checkbox.c | 0 examples/{ => basic}/example.c | 0 examples/{ => basic}/image.c | 0 examples/{ => basic}/listbox.c | 2 +- examples/{ => basic}/messagebox.c | 0 examples/{ => basic}/rotate.c | 0 examples/{ => basic}/scrollbar.c | 0 examples/{ => basic}/viewport.c | 0 examples/{glboing.c => gldemos/boing.c} | 2 +- examples/{glclock.c => gldemos/clock.c} | 0 examples/{glcube.c => gldemos/cube.c} | 2 +- examples/{glgears.c => gldemos/gears.c} | 2 +- examples/{oldglut.c => gldemos/glutlayer.c} | 0 examples/{gltriangle.c => gldemos/triangle.c} | 0 examples/{gltripaint.c => gldemos/tripaint.c} | 0 examples/{ => vkdemos}/triangle.frag.spv | Bin examples/{ => vkdemos}/triangle.vert.spv | Bin examples/{ => vkdemos}/vulkan.c | 2 ++ 19 files changed, 10 insertions(+), 8 deletions(-) rename examples/{ => basic}/checkbox.c (100%) rename examples/{ => basic}/example.c (100%) rename examples/{ => basic}/image.c (100%) rename examples/{ => basic}/listbox.c (97%) rename examples/{ => basic}/messagebox.c (100%) rename examples/{ => basic}/rotate.c (100%) rename examples/{ => basic}/scrollbar.c (100%) rename examples/{ => basic}/viewport.c (100%) rename examples/{glboing.c => gldemos/boing.c} (99%) rename examples/{glclock.c => gldemos/clock.c} (100%) rename examples/{glcube.c => gldemos/cube.c} (98%) rename examples/{glgears.c => gldemos/gears.c} (99%) rename examples/{oldglut.c => gldemos/glutlayer.c} (100%) rename examples/{gltriangle.c => gldemos/triangle.c} (100%) rename examples/{gltripaint.c => gldemos/tripaint.c} (100%) rename examples/{ => vkdemos}/triangle.frag.spv (100%) rename examples/{ => vkdemos}/triangle.vert.spv (100%) rename examples/{ => vkdemos}/vulkan.c (99%) diff --git a/GNUmakefile b/GNUmakefile index 650b1a0..a3c4437 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -141,18 +141,18 @@ else include external/deps.mk endif -EXAMPLES = examples/example$(EXEC) examples/rotate$(EXEC) examples/image$(EXEC) examples/scrollbar$(EXEC) examples/checkbox$(EXEC) examples/messagebox$(EXEC) examples/viewport$(EXEC) examples/listbox$(EXEC) +EXAMPLES = examples/basic/example$(EXEC) examples/basic/rotate$(EXEC) examples/basic/image$(EXEC) examples/basic/scrollbar$(EXEC) examples/basic/checkbox$(EXEC) examples/basic/messagebox$(EXEC) examples/basic/viewport$(EXEC) examples/basic/listbox$(EXEC) ifeq ($(OPENGL),1) L_OBJS += src/widget/opengl.o OOL_OBJS += oosrc/widget/opengl.o -EXAMPLES += examples/glclock$(EXEC) examples/gltriangle$(EXEC) examples/glgears$(EXEC) examples/glboing$(EXEC) examples/glcube$(EXEC) examples/gltripaint$(EXEC) +EXAMPLES += examples/gldemos/clock$(EXEC) examples/gldemos/triangle$(EXEC) examples/gldemos/gears$(EXEC) examples/gldemos/boing$(EXEC) examples/gldemos/cube$(EXEC) examples/gldemos/tripaint$(EXEC) endif ifeq ($(VULKAN),1) L_OBJS += src/widget/vulkan.o OOL_OBJS += oosrc/widget/vulkan.o -EXAMPLES += examples/vulkan$(EXEC) +EXAMPLES += examples/vkdemos/vulkan$(EXEC) endif .PHONY: all install format clean lib oolib examples @@ -186,7 +186,7 @@ src/$(LIB)Mw$(SO): $(L_OBJS) oosrc/$(LIB)MwOO$(SO): $(OOL_OBJS) src/$(LIB)Mw$(SO) $(CC) $(OOL_LDFLAGS) $(SHARED) -o $@ $(OOL_OBJS) $(OOL_LIBS) -examples/gl%$(EXEC): examples/gl%.o src/$(LIB)Mw$(SO) +examples/gldemos/%$(EXEC): examples/gldemos/%.o src/$(LIB)Mw$(SO) $(CC) $(E_LDFLAGS) -o $@ $< $(E_LIBS) $(GL) examples/%$(EXEC): examples/%.o src/$(LIB)Mw$(SO) diff --git a/examples/checkbox.c b/examples/basic/checkbox.c similarity index 100% rename from examples/checkbox.c rename to examples/basic/checkbox.c diff --git a/examples/example.c b/examples/basic/example.c similarity index 100% rename from examples/example.c rename to examples/basic/example.c diff --git a/examples/image.c b/examples/basic/image.c similarity index 100% rename from examples/image.c rename to examples/basic/image.c diff --git a/examples/listbox.c b/examples/basic/listbox.c similarity index 97% rename from examples/listbox.c rename to examples/basic/listbox.c index 3ba15d7..4197e0a 100644 --- a/examples/listbox.c +++ b/examples/basic/listbox.c @@ -1,7 +1,7 @@ /* $Id$ */ #include -#include "harvard.c" +#include "../harvard.c" MwWidget wmain; diff --git a/examples/messagebox.c b/examples/basic/messagebox.c similarity index 100% rename from examples/messagebox.c rename to examples/basic/messagebox.c diff --git a/examples/rotate.c b/examples/basic/rotate.c similarity index 100% rename from examples/rotate.c rename to examples/basic/rotate.c diff --git a/examples/scrollbar.c b/examples/basic/scrollbar.c similarity index 100% rename from examples/scrollbar.c rename to examples/basic/scrollbar.c diff --git a/examples/viewport.c b/examples/basic/viewport.c similarity index 100% rename from examples/viewport.c rename to examples/basic/viewport.c diff --git a/examples/glboing.c b/examples/gldemos/boing.c similarity index 99% rename from examples/glboing.c rename to examples/gldemos/boing.c index 9a46458..a8258b2 100644 --- a/examples/glboing.c +++ b/examples/gldemos/boing.c @@ -1,6 +1,6 @@ /* $Id$ */ #define TITLE "boing" -#include "oldglut.c" +#include "glutlayer.c" /* * Bouncing ball demo. diff --git a/examples/glclock.c b/examples/gldemos/clock.c similarity index 100% rename from examples/glclock.c rename to examples/gldemos/clock.c diff --git a/examples/glcube.c b/examples/gldemos/cube.c similarity index 98% rename from examples/glcube.c rename to examples/gldemos/cube.c index a5688a2..9bbf94c 100644 --- a/examples/glcube.c +++ b/examples/gldemos/cube.c @@ -1,6 +1,6 @@ /* $Id$ */ #define TITLE "cube" -#include "oldglut.c" +#include "glutlayer.c" #include diff --git a/examples/glgears.c b/examples/gldemos/gears.c similarity index 99% rename from examples/glgears.c rename to examples/gldemos/gears.c index 9f16b18..92f5283 100644 --- a/examples/glgears.c +++ b/examples/gldemos/gears.c @@ -1,6 +1,6 @@ /* $Id$ */ #define TITLE "gears" -#include "oldglut.c" +#include "glutlayer.c" /* * 3-D gear wheels. This program is in the public domain. diff --git a/examples/oldglut.c b/examples/gldemos/glutlayer.c similarity index 100% rename from examples/oldglut.c rename to examples/gldemos/glutlayer.c diff --git a/examples/gltriangle.c b/examples/gldemos/triangle.c similarity index 100% rename from examples/gltriangle.c rename to examples/gldemos/triangle.c diff --git a/examples/gltripaint.c b/examples/gldemos/tripaint.c similarity index 100% rename from examples/gltripaint.c rename to examples/gldemos/tripaint.c diff --git a/examples/triangle.frag.spv b/examples/vkdemos/triangle.frag.spv similarity index 100% rename from examples/triangle.frag.spv rename to examples/vkdemos/triangle.frag.spv diff --git a/examples/triangle.vert.spv b/examples/vkdemos/triangle.vert.spv similarity index 100% rename from examples/triangle.vert.spv rename to examples/vkdemos/triangle.vert.spv diff --git a/examples/vulkan.c b/examples/vkdemos/vulkan.c similarity index 99% rename from examples/vulkan.c rename to examples/vkdemos/vulkan.c index 67c120d..32ec268 100644 --- a/examples/vulkan.c +++ b/examples/vkdemos/vulkan.c @@ -389,7 +389,9 @@ void vulkan_setup(MwWidget handle) { // Create the Vertex Shader Module. vertFile = fopen("triangle.vert.spv", "rb"); + if(vertFile == NULL) vertFile = fopen("examples/vkdemos/triangle.vert.spv", "rb"); fragFile = fopen("triangle.frag.spv", "rb"); + if(fragFile == NULL) fragFile = fopen("examples/vkdemos/triangle.frag.spv", "rb"); fseek(vertFile, 0L, SEEK_END); vertFileSize = ftell(vertFile);