Browse Source

update libTangerine commit and Makefile

main
cinnaboot 5 years ago
parent
commit
4fa4f9e9cd
  1. 8
      Makefile
  2. 2
      ext/tangerine
  3. 4
      src/orbits.h

8
Makefile

@ -42,9 +42,12 @@ LDFLAGS := -lSDL2 -lGLEW -lGL
endif endif
all: mkdirs $(BIN) $(TEST_BIN) all: mkdirs $(BIN)
.PHONY: all .PHONY: all
tests: $(TEST_BIN)
.PHONY: tests
-include $(OBJDIR)/*.d -include $(OBJDIR)/*.d
mkdirs: mkdirs:
@ -77,7 +80,6 @@ $(LIB):
USE_INTERNAL_ASSIMP=$(USE_INTERNAL_ASSIMP) $(MAKE) -C $(LIBDIR) USE_INTERNAL_ASSIMP=$(USE_INTERNAL_ASSIMP) $(MAKE) -C $(LIBDIR)
clean: clean:
rm -rf $(OBJDIR)/* $(BIN) bin/test_orbit @rm -rf $(BIN) $(TEST_BIN) $(COMMON_OBJECTS) $(OBJECTS) $(TEST_OBJECTS)
$(MAKE) -C $(LIBDIR) clean
.PHONY: clean .PHONY: clean

2
ext/tangerine

@ -1 +1 @@
Subproject commit ca151b5c770eb586c697fe3d29c49f0de3450e1e Subproject commit 9e549fcb8817de4199479674418a8c86528a7d9e

4
src/orbits.h

@ -15,8 +15,8 @@ struct ellipse_parameters
double e; // NOTE: eccentricity double e; // NOTE: eccentricity
double c; // NOTE: linear eccentricity double c; // NOTE: linear eccentricity
double p; // NOTE: semilatus rectum double p; // NOTE: semilatus rectum
glm::vec2 f1; glm::vec2 f1; // NOTE: 'vacant' focus
glm::vec2 f2; glm::vec2 f2; // NOTE: 'primary' focus
}; };
struct orbital_elements struct orbital_elements

Loading…
Cancel
Save