Skip to content

changes for shared flight #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
justinsnapp wants to merge 34 commits into
base: panelmanager
Choose a base branch
from
Draft

changes for shared flight #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6118d3b
Added additional manipulators to obj8 parser
Jun 21, 2023
1d0dcee
Merge branch 'skiselkov:master' into master
justinsnapp Oct 9, 2023
f8dd437
rebase to saso changes
Oct 10, 2023
c0583fe
rebase to saso changes
Oct 10, 2023
1feb837
do not include noop manipulators
Oct 13, 2023
702340c
changes for shared flight manip highlighting
Jan 11, 2024
7a28c8c
cleanup crap code
Jan 11, 2024
e520e8a
changes for manip highlihting in Shared Flight
Jan 13, 2024
84ca009
removed stray .o files
Jan 13, 2024
8b0a827
changes for shared flight manip highlighting
Jan 14, 2024
c2519dd
more changes for manip drawing still WIP
Jan 15, 2024
6870423
added hover detectable flag for shared flight manip drawing
Jan 18, 2024
58af466
wip manip drawing
Jan 19, 2024
35b3bf2
wip manip stuff
Jan 26, 2024
92f06ac
wip manip drawing, removing log messages
Jan 26, 2024
773f923
manip handling changes needed
Jan 29, 2024
239b09c
latest changes for debug
Mar 17, 2024
abe41e9
fixed free that was not safe aligned after safe aligned allocation, c…
Mar 17, 2024
a5c1d71
improvements for manip map configurability
Mar 27, 2024
e46f230
Regression: pnlren_fini is crashing on Windows due to needing to use …
skiselkov Nov 4, 2023
886fccf
Add OBJ8 rendering support for better encapsulation in a background t…
skiselkov Nov 28, 2023
2456d25
Added functions to extract raw OBJ8 vertex data.
skiselkov Dec 2, 2023
f22b7a1
0004346: C99 VLAs are considered harmful and must be removed across t…
skiselkov Dec 15, 2023
7960291
Remove old XP11 datarefs from librain when running on XP12
skiselkov Jan 21, 2024
9c43829
Added additional manipulators to obj8 parser
Jun 21, 2023
c18132e
rebase to saso changes
Oct 10, 2023
333f1bf
rebase to saso changes
Oct 10, 2023
1d505bf
do not include noop manipulators
Oct 13, 2023
0c05dde
changes for shared flight manip highlighting
Jan 11, 2024
a53ccf5
cleanup crap code
Jan 11, 2024
be212ec
merge with saso latest changes
Aug 4, 2024
3781f13
Merge branch 'skiselkov-master'
Aug 4, 2024
243471a
cleanup merge done horribly...
Aug 4, 2024
cdfba64
cleanup of horribly failed merge
Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ plugin/qmake/Makefile.Debug
plugin/qmake/Makefile.Release
plugin/qmake/release
plugin/qmake/Makefile
.DS_Store
Binary file added qmake/objmgr.o
View file
Open in desktop
Binary file not shown.
13 changes: 10 additions & 3 deletions qmake/qmake.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ INCLUDEPATH += $$[LIBACFUTILS]/SDK/CHeaders/XPLM
INCLUDEPATH += $$[LIBACFUTILS]/SDK/CHeaders/Widgets
INCLUDEPATH += $$[LIBACFUTILS]/glew
INCLUDEPATH += $$[LIBACFUTILS]/cglm/cglm-0.4.1/include
QMAKE_CFLAGS += -std=c99 -O2 -g -W -Wall -Wextra -Werror -fvisibility=hidden
QMAKE_CFLAGS += -std=c11 -O2 -g -W -Wall -Wextra -Werror -fvisibility=hidden
QMAKE_CFLAGS += -Wunused-result -Wno-missing-field-initializers

# Make sure to disable Qmake's own warnings system, because it overrides
Expand Down Expand Up @@ -89,7 +89,7 @@ linux-g++-64 {

macx {
DEFINES += APL=1 IBM=0 LIN=0
QMAKE_CFLAGS += -mmacosx-version-min=10.9
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15
}

macx-clang {
Expand All @@ -105,7 +105,14 @@ macx-clang {
LIBS += -F$$[LIBACFUTILS]/SDK/Libraries/Mac
LIBS += -framework OpenGL
LIBS += -framework XPLM

LIBS += -framework Cocoa

SOILPATH = "/Users/jsnapp/Documents/SharedFlight/Simple-OpenGL-Image-Library"
LIBS += "-L$${SOILPATH}/build" -lSOIL
INCLUDEPATH += "$${SOILPATH}/src"

}

HEADERS += ../src/*.h
SOURCES += ../src/*.c
SOURCES += ../src/*.c
Binary file added qmake/surf_ice.o
View file
Open in desktop
Binary file not shown.
Loading