Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Frank
authored and
Frank
committed
Sep 15, 2010
1 parent
8511f0e
commit 9d243ba
Showing
12 changed files
with
214 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
l 0.9 0.6 0.25 0.1 1.0 1 1 | ||
B -2.1 2.1 -2.1 -1.9 -0.6 1.0 | ||
B -2.1 2.1 1.9 2.1 -0.6 1.0 | ||
B -2.1 -1.9 -2.1 2.1 -0.6 1.0 | ||
B 1.9 2.1 -2.1 2.1 -0.6 1.0 | ||
# B -3.0 -2.0 2.9 3.1 -0.6 -0.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
t 0.0 0.0 0.0 | ||
|
||
l 0.9 0.6 0.25 0.1 1.0 -1 1 | ||
B -2.0 2.0 -2.0 2.0 -4.0 -3.8 | ||
l 1.0 0.0 0.0 0.1 1.0 -1 1 | ||
B -2.0 2.0 -2.0 2.0 -3.0 -2.8 | ||
|
||
l 0.0 0.0 1.0 0.1 1.0 -1 1 | ||
B -2.0 -1.9 0.0 2.0 -3.8 -3.0 | ||
B -2.0 2.0 -2.0 -1.9 -3.8 -3.0 | ||
B 1.9 2.0 -2.0 2.0 -3.8 -3.0 | ||
B -2.0 2.0 1.9 2.0 -3.8 -3.0 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
l 0.9 0.6 0.25 0.1 1.0 -1 1 | ||
B -0.5 0.5 -0.5 0.5 -0.5 0.20 | ||
l 0.9 1.0 0.00 0.0 1.0 -1 1 | ||
B -0.2 0.2 -0.2 0.2 -0.5 0.22 | ||
l 0.9 0.0 0.00 1.0 1.0 -1 1 | ||
B -0.2 0.2 -0.2 0.2 0.40 0.50 | ||
B -0.2 -0.1 -0.2 -0.1 0.30 0.40 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
t 0.0 0.0 -3.1 | ||
|
||
l 0.9 0.6 0.25 0.1 1.0 -1 1 | ||
B -0.5 0.5 -0.5 0.5 -0.5 0.20 | ||
|
||
B -0.5 -0.4 -0.5 -0.4 0.20 0.22 | ||
B -0.4 -0.3 -0.5 -0.4 0.22 0.24 | ||
B -0.3 -0.2 -0.5 -0.4 0.24 0.26 | ||
B -0.2 -0.1 -0.5 -0.4 0.26 0.28 | ||
B -0.1 0.0 -0.5 -0.4 0.28 0.30 | ||
B 0.0 0.1 -0.5 -0.4 0.30 0.32 | ||
B 0.1 0.2 -0.5 -0.4 0.32 0.34 | ||
B 0.2 0.3 -0.5 -0.4 0.34 0.36 | ||
|
||
l 0.7 0.0 0.0 1.0 0.5 -1 1 | ||
S -0.5 -0.5 0.3 0.25 | ||
|
||
l 0.7 1.0 0.0 0.0 0.7 -1 1 | ||
C -0.5 0.5 -0.3 -0.5 0.5 0.3 0.2 0.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
l 0.9 0.6 0.25 0.1 1.0 1 1 | ||
B -3.0 -2.0 -3.1 -2.9 -0.6 -0.1 | ||
B -3.0 -2.0 -1.6 -1.4 -0.6 -0.1 | ||
B -3.0 -2.0 -0.1 0.1 -0.6 -0.1 | ||
B -3.0 -2.0 1.4 1.6 -0.6 -0.1 | ||
B -3.0 -2.0 2.9 3.1 -0.6 -0.1 | ||
|
||
B -1.5 -0.5 -3.1 -2.9 -0.6 -0.1 | ||
B -1.5 -0.5 -1.6 -1.4 -0.6 -0.1 | ||
B -1.5 -0.5 -0.1 0.1 -0.6 -0.1 | ||
B -1.5 -0.5 1.4 1.6 -0.6 -0.1 | ||
B -1.5 -0.5 2.9 3.1 -0.6 -0.1 | ||
|
||
B 0.5 1.5 -3.1 -2.9 -0.6 -0.1 | ||
B 0.5 1.5 -1.6 -1.4 -0.6 -0.1 | ||
B 0.5 1.5 -0.1 0.1 -0.6 -0.1 | ||
B 0.5 1.5 1.4 1.6 -0.6 -0.1 | ||
B 0.5 1.5 2.9 3.1 -0.6 -0.1 | ||
|
||
B 2.0 3.0 -3.1 -2.9 -0.6 -0.1 | ||
B 2.0 3.0 -1.6 -1.4 -0.6 -0.1 | ||
B 2.0 3.0 -0.1 0.1 -0.6 -0.1 | ||
B 2.0 3.0 1.4 1.6 -0.6 -0.1 | ||
B 2.0 3.0 2.9 3.1 -0.6 -0.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
w 1.8 2.8 3.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
t 0.0 0.0 -3.5 # translate -Z | ||
l 0.8 0.7 0.7 0.7 1.0 -1 1 # elasticity R G B A texture_id draw | ||
#B -4.4 4.4 -0.1 0.1 -2.0 2.0 | ||
|
||
m 0.1 # scale | ||
s 1 2 # swap Y and Z | ||
M 2 # mirror in Z | ||
|
||
#O ..\Sponza\sponza.obj | ||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
|
||
VPATH=../src | ||
#CPPFLAGS=-g -Wall | ||
CPPFLAGS=-g -Wall -O3 | ||
TARGET=../lib/3dworld | ||
OBJS=$(shell cat ../src/obj_list) | ||
TARGET2= | ||
OBJS2= | ||
|
||
LIB_TARGET= | ||
LIB_OBJS= | ||
|
||
#LINK=g++ $(CPPFLAGS) -lz -lpng -lpthread -L/usr/X11R6/lib64 -lglut -lGL -lGLU | ||
LINK=g++ $(CPPFLAGS) -lz -lpng -lpthread $(shell pkg-config --libs xrender) -lglui -lglut -lGL -lGLU | ||
|
||
LFLAGS=$(LIB_TARGET) | ||
|
||
# In most cases, you should not change anything below this line. | ||
ifeq ($(shell test -L makefile ; echo $$? ),1) | ||
all : | ||
@echo "makefile should be a symbolic link to avoid accidentally building in the src directory ... attempting to create ../obj,../lib,../run, symlink makefile in ../obj, and recurse make into ../obj" | ||
-mkdir ../obj | ||
-mkdir ../run | ||
-mkdir ../lib | ||
-ln -s ../src/makefile ../obj/makefile | ||
cd ../obj && $(MAKE) | ||
else | ||
|
||
# disable old-style .SUFFIXES rules. this may not be needed? | ||
.SUFFIXES: | ||
|
||
%.o : %.C | ||
$(CPP) $(CPPFLAGS) -MMD -c $< | ||
%.o : %.cc | ||
$(CPP) $(CPPFLAGS) -MMD -c $< | ||
%.o : %.cpp | ||
$(CPP) $(CPPFLAGS) -MMD -c $< | ||
|
||
CPP=g++ | ||
|
||
%.d: %.C | ||
touch $@ | ||
%.d: %.cc | ||
touch $@ | ||
%.d: %.cpp | ||
touch $@ | ||
|
||
DEPENDENCIES = $(OBJS2:.o=.d) $(OBJS:.o=.d) $(LIB_OBJS:.o=.d) | ||
|
||
# | ||
# Targets: | ||
# | ||
|
||
all : $(TARGET) $(TARGET2) | ||
|
||
ifneq ($(LIB_TARGET),"") | ||
$(LIB_TARGET): $(LIB_OBJS) | ||
$(LINK) $(FLAGS) -shared -o $(LIB_TARGET) $(LIB_OBJS) | ||
endif | ||
|
||
$(TARGET): $(OBJS) $(LIB_TARGET) | ||
$(LINK) $(FLAGS) -o $(TARGET) $(OBJS) $(LFLAGS) | ||
|
||
ifneq ($(TARGET2),"") | ||
$(TARGET2): $(OBJS2) $(LIB_TARGET) | ||
$(LINK) $(FLAGS) -o $(TARGET2) $(OBJS2) $(LFLAGS) | ||
endif | ||
|
||
.PHONY : clean | ||
|
||
clean: | ||
-rm -f $(TARGET) $(TARGET2) $(OBJS) $(OBJS2) $(LIB_TARGET) $(LIB_OBJS) $(DEPENDENCIES) make.dep | ||
|
||
make.dep: $(DEPENDENCIES) | ||
-cat $(DEPENDENCIES) > make.dep | ||
|
||
include make.dep | ||
|
||
endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
3DWorld.o | ||
ai.o | ||
build_world.o | ||
coll_cell_search.o | ||
collision_detect.o | ||
csg.o | ||
display_world.o | ||
draw_mech.o | ||
draw_mesh.o | ||
draw_shapes.o | ||
draw_ship.o | ||
draw_world.o | ||
explosion.o | ||
free_obj.o | ||
Gameplay.o | ||
gen_object.o | ||
glflare.o | ||
intersect.o | ||
lightmap.o | ||
lightning.o | ||
Loadlum.o | ||
map_view.o | ||
Math3d.o | ||
matrix_ops.o | ||
mesh_gen.o | ||
objects.o | ||
Ocean.o | ||
Physics.o | ||
quartic.o | ||
scenery.o | ||
shape_line3d.o | ||
ship_base.o | ||
ship_config.o | ||
ship.o | ||
ship_intersect.o | ||
ship_query.o | ||
sm_tree.o | ||
spillover.o | ||
Terrain.o | ||
Textures.o | ||
Thread.o | ||
Tree.o | ||
u_event.o | ||
Universe_control.o | ||
Universe.o | ||
u_ship.o | ||
visibility.o | ||
Water.o | ||
screenshot.o | ||
mesh_intersect.o | ||
draw_primitives.o | ||
shadows.o | ||
|