-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathblendertoupbge.diff
11303 lines (10585 loc) · 419 KB
/
blendertoupbge.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b64f7b..f1c6f52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,12 +234,19 @@ option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" )
mark_as_advanced(WITH_SYSTEM_BULLET)
option(WITH_GAMEENGINE "Enable Game Engine" ${_init_GAMEENGINE})
+
+option(WITH_GAMEENGINE_SECURITY "Disable game engine python debugging tools" OFF)
+mark_as_advanced(WITH_GAMEENGINE_SECURITY)
+
+option(WITH_GAMEENGINE_GPU_SYNC "Enable GPU synchronization for VideoTexture module image rendering (ImageRender)" OFF)
+mark_as_advanced(WITH_GAMEENGINE_GPU_SYNC)
+
if(APPLE)
set(WITH_GAMEENGINE_DECKLINK OFF)
else()
option(WITH_GAMEENGINE_DECKLINK "Support BlackMagicDesign DeckLink cards in the Game Engine" ON)
endif()
-option(WITH_PLAYER "Build Player" OFF)
+option(WITH_PLAYER "Build Player" ON)
option(WITH_OPENCOLORIO "Enable OpenColorIO color management" ${_init_OPENCOLORIO})
# Compositor
@@ -282,6 +289,7 @@ endif()
if(WITH_X11)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
+ option(WITH_X11_XINERAMA "Enable multi-monitor support" ON)
option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON)
option(WITH_X11_ALPHA "Enable X11 transparent background" ON)
endif()
@@ -688,9 +696,6 @@ if(NOT WITH_AUDASPACE)
if(WITH_JACK)
message(FATAL_ERROR "WITH_JACK requires WITH_AUDASPACE")
endif()
- if(WITH_GAMEENGINE)
- message(FATAL_ERROR "WITH_GAMEENGINE requires WITH_AUDASPACE")
- endif()
endif()
if(NOT WITH_SDL AND WITH_GHOST_SDL)
@@ -780,6 +785,7 @@ endif()
if(WITH_GHOST_SDL OR WITH_HEADLESS)
set(WITH_X11 OFF)
set(WITH_X11_XINPUT OFF)
+ set(WITH_X11_XINERAMA OFF)
set(WITH_X11_XF86VMODE OFF)
set(WITH_X11_ALPHA OFF)
set(WITH_GHOST_XDND OFF)
@@ -910,6 +916,14 @@ if(WITH_X11)
endif()
endif()
+ if(WITH_X11_XINERAMA)
+ if(X11_Xinerama_LIB)
+ list(APPEND PLATFORM_LINKLIBS ${X11_Xinerama_LIB})
+ else()
+ set(WITH_X11_XINERAMA OFF)
+ endif()
+ endif()
+
if(WITH_X11_XF86VMODE)
# XXX, why dont cmake make this available?
find_library(X11_Xxf86vmode_LIB Xxf86vm ${X11_LIB_SEARCH_PATH})
@@ -1727,7 +1741,9 @@ if(FIRST_RUN)
info_cfg_text("Build Options:")
info_cfg_option(WITH_GAMEENGINE)
+ info_cfg_option(WITH_GAMEENGINE_SECURITY)
info_cfg_option(WITH_PLAYER)
+ info_cfg_option(WITH_GAMEENGINE_GPU_SYNC)
info_cfg_option(WITH_BULLET)
info_cfg_option(WITH_IK_SOLVER)
info_cfg_option(WITH_IK_ITASC)
@@ -1751,6 +1767,7 @@ if(FIRST_RUN)
info_cfg_option(WITH_X11_ALPHA)
info_cfg_option(WITH_X11_XF86VMODE)
info_cfg_option(WITH_X11_XINPUT)
+ info_cfg_option(WITH_X11_XINERAMA)
info_cfg_option(WITH_MEM_JEMALLOC)
info_cfg_option(WITH_MEM_VALGRIND)
info_cfg_option(WITH_SYSTEM_GLEW)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 2e3a190..57823db 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -627,6 +627,8 @@ function(SETUP_BLENDER_SORTED_LIBS)
bf_intern_ctr
bf_intern_utfconv
ge_blen_routines
+ ge_launcher
+ ge_blen_routines
ge_converter
ge_phys_dummy
ge_phys_bullet
@@ -636,13 +638,13 @@ function(SETUP_BLENDER_SORTED_LIBS)
ge_logic_ketsji
extern_recastnavigation
ge_logic
- ge_rasterizer
+ ge_device
ge_oglrasterizer
+ ge_rasterizer
+ ge_common
ge_logic_expressions
ge_scenegraph
ge_logic_network
- ge_logic_ngnetwork
- ge_logic_loopbacknetwork
bf_intern_moto
extern_openjpeg
ge_videotex
@@ -735,7 +737,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
endif()
if(WITH_BULLET AND NOT WITH_SYSTEM_BULLET)
- list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet")
+ list(APPEND BLENDER_SORTED_LIBS extern_bullet)
endif()
if(WITH_GAMEENGINE_DECKLINK)
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index e549a48..16d6183 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -246,6 +246,13 @@ elseif(WITH_X11)
)
endif()
+ if(WITH_X11_XINERAMA)
+ add_definitions(-DWITH_X11_XINERAMA)
+ list(APPEND INC_SYS
+ ${X11_Xinerama_INCLUDE_PATH}
+ )
+ endif()
+
add_definitions(-DWITH_X11)
elseif(WIN32)
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 30cfac0..31b3361 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -55,6 +55,10 @@
# include "GHOST_DropTargetX11.h"
#endif
+#ifdef WITH_X11_XINERAMA
+# include "X11/extensions/Xinerama.h"
+#endif
+
#include "GHOST_Debug.h"
#ifdef WITH_XF86KEYSYM
@@ -283,9 +287,47 @@ getMainDisplayDimensions(
GHOST_TUns32& height) const
{
if (m_display) {
- /* note, for this to work as documented,
- * we would need to use Xinerama check r54370 for code that did this,
- * we've since removed since its not worth the extra dep - campbell */
+
+#ifdef WITH_X11_XINERAMA
+ GHOST_TInt32 m_x = 1, m_y = 1;
+ getCursorPosition(m_x, m_y);
+
+ /* NOTE, no way to select a primary monitor, uses the first */
+ bool success = false;
+ int dummy1, dummy2;
+ if (XineramaQueryExtension(m_display, &dummy1, &dummy2)) {
+ if (XineramaIsActive(m_display)) {
+ int heads = 0;
+ XineramaScreenInfo *p = XineramaQueryScreens(m_display, &heads);
+ /* with a single head, all dimensions is fine */
+ if (heads > 1) {
+ int i;
+ for (i = 0; i < heads; i++) {
+ if ((m_x >= p[i].x_org) && (m_x <= p[i].x_org + p[i].width) &&
+ (m_y >= p[i].y_org) && (m_y <= p[i].y_org + p[i].height))
+ {
+ width = p[i].width;
+ height = p[i].height;
+ break;
+ }
+ }
+ /* highly unlikely! */
+ if (i == heads) {
+ width = p[0].width;
+ height = p[0].height;
+ }
+ success = true;
+ }
+ XFree(p);
+ }
+ }
+
+ if (success) {
+ return;
+ }
+#endif
+
+ /* fallback to all */
getAllDisplayDimensions(width, height);
}
}
diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h
index 4607db4..2053163 100644
--- a/intern/string/STR_String.h
+++ b/intern/string/STR_String.h
@@ -46,6 +46,7 @@
#endif
#include <vector>
+#include <string> // Compatibility
#include <limits.h>
#include <cstring>
@@ -81,6 +82,7 @@ public:
STR_String(const STR_String &str);
STR_String(const STR_String & str, int len);
STR_String(const char *src1, int src1_len, const char *src2, int src2_len);
+ STR_String(const std::string& s); // Compatibility
explicit STR_String(int val);
explicit STR_String(dword val);
explicit STR_String(float val);
diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp
index 4612c91..9e936fb 100644
--- a/intern/string/intern/STR_String.cpp
+++ b/intern/string/intern/STR_String.cpp
@@ -175,7 +175,15 @@ STR_String::STR_String(const char *src1, int len1, const char *src2, int len2) :
this->m_data[len1 + len2] = 0;
}
-
+STR_String::STR_String(const std::string& s) :
+ m_data(new char[s.size() + 8]),
+ m_len(s.size()),
+ m_max(s.size() + 8)
+{
+ assertd(this->m_data != NULL);
+ memcpy(this->m_data, s.c_str(), s.size());
+ this->m_data[s.size()] = 0;
+}
//
// Create a string with an integer value
diff --git a/intern/termcolor/LICENSE b/intern/termcolor/LICENSE
new file mode 100644
index 0000000..0905ac6
--- /dev/null
+++ b/intern/termcolor/LICENSE
@@ -0,0 +1,31 @@
+Copyright (c) 2013 by Igor Kalnitsky.
+All rights reserved.
+
+Redistribution and use in source and binary forms of the software as well
+as documentation, with or without modification, are permitted provided
+that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+* The names of the contributors may not be used to endorse or
+ promote products derived from this software without specific
+ prior written permission.
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/intern/termcolor/README b/intern/termcolor/README
new file mode 100644
index 0000000..b042d13
--- /dev/null
+++ b/intern/termcolor/README
@@ -0,0 +1,42 @@
+ // termcolor //
+
+ a library for printing colored messages
+
+ by Igor Kalnitsky
+
+
+ ~ What is termcolor?
+
+ Termcolor is a header-only C++ library for printing colored
+ messages to the terminal. Written just for fun with a help of
+ the Force.
+
+ And yeah, it's BSD licensed so you are free to do whatever you
+ want as long as copyright sticks around!
+
+
+ ~ How to use?
+
+ Add `termcolor.hpp` to the project and use provided stream
+ manimulators from the `termcolor` namespace.
+
+ For example:
+
+ std::cout << termcolor::red << termcolor::on_blue
+ << "Red text on blue background!"
+ << termcolor::reset << std::endl;
+
+ Please, don't forgot to reset termcolor's settings on the stream!
+
+
+ ~ What terminals are supported?
+
+ Termcolor supports ANSI color formatting. This formatting is
+ supported by most popular terminals on Linux, Unix and Mac OS.
+ On Windows, WinAPI is used instead, however, some limitations
+ are applied. Check the docs for details!
+
+
+ ~ Where the docs?
+
+ https://termcolor.readthedocs.io/
diff --git a/intern/termcolor/termcolor.hpp b/intern/termcolor/termcolor.hpp
new file mode 100644
index 0000000..1ff0e63
--- /dev/null
+++ b/intern/termcolor/termcolor.hpp
@@ -0,0 +1,518 @@
+//!
+//! termcolor
+//! ~~~~~~~~~
+//!
+//! termcolor is a header-only c++ library for printing colored messages
+//! to the terminal. Written just for fun with a help of the Force.
+//!
+//! :copyright: (c) 2013 by Igor Kalnitsky
+//! :license: BSD, see LICENSE for details
+//!
+
+#ifndef TERMCOLOR_HPP_
+#define TERMCOLOR_HPP_
+
+// the following snippet of code detects the current OS and
+// defines the appropriate macro that is used to wrap some
+// platform specific things
+#if defined(_WIN32) || defined(_WIN64)
+# define TERMCOLOR_OS_WINDOWS
+#elif defined(__APPLE__)
+# define TERMCOLOR_OS_MACOS
+#elif defined(__unix__) || defined(__unix)
+# define TERMCOLOR_OS_LINUX
+#else
+# error unsupported platform
+#endif
+
+
+// This headers provides the `isatty()`/`fileno()` functions,
+// which are used for testing whether a standart stream refers
+// to the terminal. As for Windows, we also need WinApi funcs
+// for changing colors attributes of the terminal.
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+# include <unistd.h>
+#elif defined(TERMCOLOR_OS_WINDOWS)
+# include <io.h>
+# include <windows.h>
+#endif
+
+
+#include <iostream>
+#include <cstdio>
+
+
+
+namespace termcolor
+{
+ // Forward declaration of the `_internal` namespace.
+ // All comments are below.
+ namespace _internal
+ {
+ inline FILE* get_standard_stream(const std::ostream& stream);
+ inline bool is_atty(const std::ostream& stream);
+
+ #if defined(TERMCOLOR_OS_WINDOWS)
+ inline void win_change_attributes(std::ostream& stream, int foreground, int background=-1);
+ #endif
+ }
+
+
+ inline
+ std::ostream& reset(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[00m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream, -1, -1);
+ #endif
+ }
+ return stream;
+ }
+
+
+ inline
+ std::ostream& bold(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[1m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ #endif
+ }
+ return stream;
+ }
+
+
+ inline
+ std::ostream& dark(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[2m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ #endif
+ }
+ return stream;
+ }
+
+
+ inline
+ std::ostream& underline(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[4m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ #endif
+ }
+ return stream;
+ }
+
+
+ inline
+ std::ostream& blink(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[5m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ #endif
+ }
+ return stream;
+ }
+
+
+ inline
+ std::ostream& reverse(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[7m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ #endif
+ }
+ return stream;
+ }
+
+
+ inline
+ std::ostream& concealed(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[8m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ #endif
+ }
+ return stream;
+ }
+
+
+ inline
+ std::ostream& grey(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[30m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream,
+ 0 // grey (black)
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& red(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[31m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream,
+ FOREGROUND_RED
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& green(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[32m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream,
+ FOREGROUND_GREEN
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& yellow(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[33m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream,
+ FOREGROUND_GREEN | FOREGROUND_RED
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& blue(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[34m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream,
+ FOREGROUND_BLUE
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& magenta(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[35m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream,
+ FOREGROUND_BLUE | FOREGROUND_RED
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& cyan(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[36m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream,
+ FOREGROUND_BLUE | FOREGROUND_GREEN
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& white(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[37m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream,
+ FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED
+ );
+ #endif
+ }
+ return stream;
+ }
+
+
+
+ inline
+ std::ostream& on_grey(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[40m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream, -1,
+ 0 // grey (black)
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& on_red(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[41m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream, -1,
+ BACKGROUND_RED
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& on_green(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[42m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream, -1,
+ BACKGROUND_GREEN
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& on_yellow(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[43m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream, -1,
+ BACKGROUND_GREEN | BACKGROUND_RED
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& on_blue(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[44m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream, -1,
+ BACKGROUND_BLUE
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& on_magenta(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[45m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream, -1,
+ BACKGROUND_BLUE | BACKGROUND_RED
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& on_cyan(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[46m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream, -1,
+ BACKGROUND_GREEN | BACKGROUND_BLUE
+ );
+ #endif
+ }
+ return stream;
+ }
+
+ inline
+ std::ostream& on_white(std::ostream& stream)
+ {
+ if (_internal::is_atty(stream))
+ {
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ stream << "\033[47m";
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ _internal::win_change_attributes(stream, -1,
+ BACKGROUND_GREEN | BACKGROUND_BLUE | BACKGROUND_RED
+ );
+ #endif
+ }
+
+ return stream;
+ }
+
+
+
+ //! Since C++ hasn't a way to hide something in the header from
+ //! the outer access, I have to introduce this namespace which
+ //! is used for internal purpose and should't be access from
+ //! the user code.
+ namespace _internal
+ {
+ //! Since C++ hasn't a true way to extract stream handler
+ //! from the a given `std::ostream` object, I have to write
+ //! this kind of hack.
+ inline
+ FILE* get_standard_stream(const std::ostream& stream)
+ {
+ if (&stream == &std::cout)
+ return stdout;
+ else if ((&stream == &std::cerr) || (&stream == &std::clog))
+ return stderr;
+
+ return 0;
+ }
+
+
+ //! Test whether a given `std::ostream` object refers to
+ //! a terminal.
+ inline
+ bool is_atty(const std::ostream& stream)
+ {
+ FILE* std_stream = get_standard_stream(stream);
+
+ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+ return ::isatty(fileno(std_stream));
+ #elif defined(TERMCOLOR_OS_WINDOWS)
+ return ::_isatty(_fileno(std_stream));
+ #endif
+ }
+
+
+ #if defined(TERMCOLOR_OS_WINDOWS)
+ //! Change Windows Terminal colors attribute. If some
+ //! parameter is `-1` then attribute won't changed.
+ inline void win_change_attributes(std::ostream& stream, int foreground, int background)
+ {
+ // yeah, i know.. it's ugly, it's windows.
+ static WORD defaultAttributes = 0;
+
+ // get terminal handle
+ HANDLE hTerminal = INVALID_HANDLE_VALUE;
+ if (&stream == &std::cout)
+ hTerminal = GetStdHandle(STD_OUTPUT_HANDLE);
+ else if (&stream == &std::cerr)
+ hTerminal = GetStdHandle(STD_ERROR_HANDLE);
+
+ // save default terminal attributes if it unsaved
+ if (!defaultAttributes)
+ {
+ CONSOLE_SCREEN_BUFFER_INFO info;
+ if (!GetConsoleScreenBufferInfo(hTerminal, &info))
+ return;
+ defaultAttributes = info.wAttributes;
+ }
+
+ // restore all default settings
+ if (foreground == -1 && background == -1)
+ {
+ SetConsoleTextAttribute(hTerminal, defaultAttributes);
+ return;
+ }
+
+ // get current settings
+ CONSOLE_SCREEN_BUFFER_INFO info;
+ if (!GetConsoleScreenBufferInfo(hTerminal, &info))
+ return;
+
+ if (foreground != -1)
+ {
+ info.wAttributes &= ~(info.wAttributes & 0x0F);
+ info.wAttributes |= static_cast<WORD>(foreground);
+ }
+
+ if (background != -1)
+ {
+ info.wAttributes &= ~(info.wAttributes & 0xF0);
+ info.wAttributes |= static_cast<WORD>(background);
+ }
+
+ SetConsoleTextAttribute(hTerminal, info.wAttributes);
+ }
+ #endif // TERMCOLOR_OS_WINDOWS
+
+ } // namespace _internal
+
+} // namespace termcolor
+
+
+#undef TERMCOLOR_OS_WINDOWS
+#undef TERMCOLOR_OS_MACOS
+#undef TERMCOLOR_OS_LINUX
+
+#endif // TERMCOLOR_HPP_
diff --git a/release/scripts/bge/interpreter.py b/release/scripts/bge/interpreter.py
new file mode 100644
index 0000000..8f2031b
--- /dev/null
+++ b/release/scripts/bge/interpreter.py
@@ -0,0 +1,25 @@
+import sys
+import os
+import bge
+import code
+
+# Check if a console exits.
+if os.isatty(sys.stdin.fileno()):
+ try:
+ import readline
+ except ImportError:
+ print("Can not enable autocompletion, readline module is missing")
+ else:
+ import rlcompleter
+ # Autocompletion with tab.
+ readline.parse_and_bind("tab: complete")
+
+ if sys.platform.startswith("win"):
+ print("Python interpreter started. Press Ctrl+C or Ctrl+Z+Enter to quit.")
+ elif sys.platform.startswith("linux"):
+ print("Python interpreter started. Press Ctrl+D to quit.")
+ else:
+ print("Python interpreter started.") #TODO: find OSX shortcut.
+
+ # Launch interactive console with current locals.
+ code.interact(local=locals())
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index c6fa77a..1f5bf2e 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -258,6 +258,8 @@ class DATA_PT_camera_display(CameraButtonsPanel, Panel):
col = split.column()
col.prop(cam, "show_limits", text="Limits")
+ if context.scene.render.engine == 'BLENDER_GAME':
+ col.prop(cam, "show_frustum", text="Frustum")
col.prop(cam, "show_mist", text="Mist")
col.prop(cam, "show_sensor", text="Sensor")
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
index 98b7a76..87e4465 100644
--- a/release/scripts/startup/bl_ui/properties_game.py
+++ b/release/scripts/startup/bl_ui/properties_game.py
@@ -26,7 +26,6 @@ class PhysicsButtonsPanel:
bl_region_type = 'WINDOW'
bl_context = "physics"
-
class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
bl_label = "Physics"
COMPAT_ENGINES = {'BLENDER_GAME'}
@@ -66,7 +65,7 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
col.prop(ob, "hide_render", text="Invisible") # out of place but useful
col = split.column()
- col.prop(game, "use_material_physics_fh")
+ col.prop(game, "use_physics_fh")
col.prop(game, "use_rotate_from_normal")
col.prop(game, "use_sleep")
@@ -79,8 +78,19 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
col.prop(game, "mass")
col.prop(game, "radius")
col.prop(game, "form_factor")
+ col.prop(game, "elasticity", slider=True)
+
+ col.label(text="Linear velocity:")
+ sub = col.column(align=True)
+ sub.prop(game, "velocity_min", text="Minimum")
+ sub.prop(game, "velocity_max", text="Maximum")
col = split.column()
+ col.label(text="Friction:")
+ col.prop(game, "friction")
+ col.prop(game, "rolling_friction")
+ col.separator()
+
sub = col.column()
sub.prop(game, "use_anisotropic_friction")
subsub = sub.column()
@@ -88,12 +98,7 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
subsub.prop(game, "friction_coefficients", text="", slider=True)
split = layout.split()
-
col = split.column()
- col.label(text="Linear velocity:")
- sub = col.column(align=True)
- sub.prop(game, "velocity_min", text="Minimum")
- sub.prop(game, "velocity_max", text="Maximum")
col.label(text="Angular velocity:")
sub = col.column(align=True)
sub.prop(game, "angular_velocity_min", text="Minimum")
@@ -107,20 +112,22 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
layout.separator()
- split = layout.split()
+ col = layout.column()
- col = split.column()
col.label(text="Lock Translation:")
- col.prop(game, "lock_location_x", text="X")
- col.prop(game, "lock_location_y", text="Y")
- col.prop(game, "lock_location_z", text="Z")
+ row = col.row()
+ row.prop(game, "lock_location_x", text="X")
+ row.prop(game, "lock_location_y", text="Y")
+ row.prop(game, "lock_location_z", text="Z")
if physics_type == 'RIGID_BODY':
- col = split.column()
+ col = layout.column()
+
col.label(text="Lock Rotation:")
- col.prop(game, "lock_rotation_x", text="X")
- col.prop(game, "lock_rotation_y", text="Y")
- col.prop(game, "lock_rotation_z", text="Z")
+ row = col.row()
+ row.prop(game, "lock_rotation_x", text="X")
+ row.prop(game, "lock_rotation_y", text="Y")
+ row.prop(game, "lock_rotation_z", text="Z")
elif physics_type == 'SOFT_BODY':
col = layout.column()
@@ -162,7 +169,6 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
col = layout.column()
col.prop(game, "use_actor")
col.prop(game, "use_ghost")
- col.prop(game, "use_record_animation")
col.prop(ob, "hide_render", text="Invisible")
layout.separator()
@@ -172,6 +178,9 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
col = split.column()
col.label(text="Attributes:")
col.prop(game, "radius")
+ col.label(text="Friction:")