Mercurial > hg > dmlib

changeset 891:fface5a23b2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Link to -lm and fix to match changes in dmperlin.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 17 Feb 2015 06:00:29 +0200
parents 6a2a286f3d70
children c722ee4018e5
files Makefile.gen tests/efu.c
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Thu Feb 05 00:24:30 2015 +0200
+++ b/Makefile.gen	Tue Feb 17 06:00:29 2015 +0200
@@ -427,15 +427,15 @@
 ###
 $(TESTS_BINPATH)blittest$(EXEEXT): $(OBJPATH)blittest.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm
 
 $(TESTS_BINPATH)efu$(EXEEXT): $(OBJPATH)efu.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm
 
 $(TESTS_BINPATH)vptest$(EXEEXT): $(OBJPATH)vptest.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm
 
 $(TESTS_BINPATH)evaltest$(EXEEXT): $(OBJPATH)evaltest.o $(OBJPATH)dmeval.o $(OBJPATH)dmevalw.o $(DMLIB_A)
 	@echo " LINK $+"
@@ -447,7 +447,7 @@
 
 $(TESTS_BINPATH)plrtest$(EXEEXT): $(OBJPATH)plrtest.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lm
 
 
 ###
--- a/tests/efu.c	Thu Feb 05 00:24:30 2015 +0200
+++ b/tests/efu.c	Tue Feb 17 06:00:29 2015 +0200
@@ -3,6 +3,7 @@
 #include "dmvecmat.h"
 #include "dmimage.h"
 #include "dmtext.h"
+#include "dmperlin.h"
 #include <math.h>
 
 #define DM_COLORS (256)
@@ -13,6 +14,7 @@
 int optVFlags = SDL_SWSURFACE | SDL_HWPALETTE;
 int optScrWidth = 640, optScrHeight = 480, optFontSize = 20, optScrDepth = 32;
 int optBenchmarkLen = 20;
+DMPerlinContext perlinCtx;
 
 static const DMOptArg optList[] =
 {
@@ -164,7 +166,7 @@
     for (y = 0; y < QHEIGHT; y++)
         for (x = 0; x < QWIDTH; x++)
         {
-            DMFloat f = 0.40f + dmPerlinNoise2D(x, y, 1.1f, q, 2);
+            DMFloat f = 0.40f + dmPerlinNoise2D(&perlinCtx, x, y, 1.1f, q, 2);
             map[y][x] = (int) (dmClamp10(f) * m);
         }
 }
@@ -347,7 +349,7 @@
         SDL_WM_SetCaption("Halleluja", "DMT");
     }
 
-    dmPerlinInit();
+    dmPerlinInit(&perlinCtx, 1234);
 
     bmap = SDL_CreateRGBSurface(SDL_SWSURFACE, QWIDTH, QHEIGHT, 8, 0, 0, 0, 0);
     DM_MakePalette(bmap);