Commit Graph

43 Commits

Author SHA1 Message Date
Valera 0519685f72 Add methods to change window icons on windows and linux ()
* Add GLViewImpl::setIcon and GLViewImpl::setDefaultIcon for windows and linux

* Include CCImage.h only if required

* Fix empty icon image

* Fix windows build

* [skip ci] Replace `{ return; }` with `{}`

* Add icon test to cpp-empty-test

* [skip ci] Replace TABs with spaces, add comments

* Chnage requested things, fix formatting

* Fix define

* Fix ios build
2018-05-23 09:29:49 +08:00
leeda 18a6d8241d update Copyright. might need manual fix later ()
* Copyright use python script updated. might be fix by manual later

* Revert "Copyright use python script updated. might be fix by manual later"

This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.

* re modify copyright, consider utf-8-sig encoding

* another situation, add Copyright before  "Permission is hereby granted"

* Revert "another situation, add Copyright before  "Permission is hereby granted""

This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.

* another situation, add Copyright before Permission is hereby granted

* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."

* script modify copyright, consider is cocos copyright or not

* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."

* manual fix, not fix audio related

* change "2016-2016" to "2016"
2018-01-29 16:25:32 +08:00
newnon 5d006192aa V3 multisampling support ()
* Multisampling support

* fix opengl initialization with multisampling

* fix merge conflict

* reverted default attributes
2018-01-19 09:28:22 +08:00
Dmitry 6e013b5a8a fixed GLViewImpl::getMonitorSize() for desktop platforms () 2017-08-22 14:06:53 +08:00
Wilson E. Alvarez bdfb71b05b Moved GLFWEventHandler to its corresponding header () 2017-07-13 17:34:28 +08:00
radman0x c442275c8e 17357: Better encapsulate the definition of mouse buttons ()
* 17357: Better encapsulate the definition of mouse buttons

Move definition of buttons from a list of #define's to an enum class and
make appropriate updates for successful compilation.

* 17357: Better encapsulate the definition of mouse buttons

Updates from code review:
* Removed changes to automatically generated files
* Removed std::ostream& convenience operator

* 17357: Fix mouse tests
2017-03-02 13:39:33 +08:00
CocosRobot d07794052f Update license to 2017 ()
* Typo: CopyRight -> Copyright

* Copyright update: chukong-inc.com -> Chukong Technologies Inc.

* [js files] Copyright update: 2014 -> 2014-2017

* [cpp files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2015 -> 2015-2017

* [js files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2016 -> 2016-2017

* Copyright update: 2013 -> 2013-2017

* Copyright update: 201?-201? -> 201?-2017

* License year fixes.

* Liscene year fix in CCRay.cpp

* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
pyrosphere 663bb4d7ed No CC_UNUSED_PARAM ()
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro

* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM

* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.

* Fixed some errors and warnings caused by the previous commit.

* Commented remaining unused parameter names in .cpp files.

* Fixed unused parameter warnings in headers.

* Fixed some more unused parameter warnings.

* Fixed some more unused parameters warnings.

* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.

* Fixed build errors.

* Added missing file to CMakeLists
2016-11-16 09:48:37 +08:00
pyrosphere 1667a5c444 Toggle between windowed/fullscreen on desktop ()
* GLViewImpl methods for desktop window management - toggle between fullscreen/windowed

* Window management tests (mac)

* Added window management tests to Win32 and Linux

* Added const keyword. Removed platform macros.
2016-10-31 14:02:02 +08:00
Steve Tranby b22efc9115 Features: add events for window resize, focus, and unfocus ()
* add events for window resize, focus, and unfocus

* fix typo
2016-09-20 20:32:33 -07:00
James Chen b135d512d2 Update copyright to 2016. () 2016-08-05 09:42:15 +08:00
Ricardo Quesada 1a834ebdbf fix: FPS appears again
Sets default glviewport() when the GLView::updateDesignResolutionSize()
is called

github issue 
2016-07-21 15:12:57 -07:00
Ricardo Quesada 5f0c0163b3 fix: display FPS again on GLFW platforms
Apparently GLFW stop emitting some events that creation time.
2016-07-19 18:26:14 -07:00
mogemimi b9c78ac41c Use std::abs to avoid overhead of casting float to double 2016-07-13 00:55:11 +09:00
mogemimi a348cbda8b Move StringUtils functions from deprecated header file to ccUTF8.h ()
* Move StringUtils functions outside of deprecated header

* Replace deprecated headers with 'base/ccUTF8.h'
2016-06-15 15:01:26 +08:00
minggo 7243b00cad add a new create method to create resizable window 2016-06-02 15:48:16 +08:00
xiaofeng11 061fc2f287 Fix on win32 platform if cpp-tests' windows been minisized, after window restore, content size is wrong. () 2016-04-18 17:15:56 +08:00
Xpol Wan 90456d29ba Fixes 1605 include path in 541 files
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
Vladimir Perminov 8eec628e04 Desktop implement dispatchControlKey
And fix bag control char for OSX onGLFWCharCallback
glow send on CharCallback character control key unicode.
2016-03-07 14:33:59 +03:00
zilongshanren 4d128a83f4 Merge pull request from elvman/resizable_window
Resizable window
2016-01-21 10:49:33 +08:00
Elviss Strazdins fc84306bcb Always update design resolution 2015-12-14 01:20:38 +02:00
Elviss Strazdins 4b33d730de Calculate frame size with zoom factor 2015-12-14 00:53:46 +02:00
Elviss Strazdins 718422c1d9 Set frame size on window resize 2015-12-14 00:20:29 +02:00
XiaoFeng acd3b5cbc4 Combine Studio change for openGL related operation 2015-11-17 13:38:42 +08:00
Elviss Strazdins f604f66539 Update only frame size on window resize 2015-11-11 04:42:58 +02:00
Elviss Strazdins eb8b761381 Add option to create resizable window 2015-11-11 01:17:48 +02:00
mogemimi 34831d48ce Fix memory leak in GLViewImpl 2015-10-19 19:46:45 +09:00
mogemimi 5993304e06 Fix typos 2015-10-09 17:59:11 +09:00
mogemimi 8c04c01953 Fix -Wformat-security warning on Xcode 2015-10-05 19:53:03 +09:00
pandamicro 9246d50a7f Merge pull request from perminovVS/v3-dev-check-create-window
glfwCreateWindow not guarantee create
2015-09-20 23:22:47 +08:00
Vladimir Perminov 527e254617 Remove glfwError 2015-09-02 18:41:23 +03:00
Vladimir Perminov b5688f504c Desktop and WinRT use correct keyboard codes
Desktop:
GLFW_KEY_ENTER equals KEY_ENTER ( GLFW_KEY_KP_ENTER = KEY_KP_ENTER)
WinRT:
VK_PRIOR equals KEY_PG_UP ( not KEY_KP_PG_UP )
2015-08-27 23:46:24 +03:00
Vladimir Perminov 8585120abb glfwCreateWindow not guarantee create
Need check glfwCreateWindow and show info, if there is a problem
2015-08-05 23:06:16 +03:00
Huabing.Xu 5f9a3b97fb fix viewport constructor error in old compiler to make it more compatible. 2015-08-05 10:57:27 +08:00
pandamicro f74438372c Merge pull request from perminovVS/v3-dev-screen-size-bug
GLViewImpl initWithRect bug size
2015-07-31 18:43:23 +08:00
Vincent Yang e1d4d22353 Fixed : UILayout viewing area cutting position calculation error 2015-07-29 18:43:11 +08:00
Huabing.Xu b79eec0b20 fix grid bug for viewport 2015-06-09 17:24:30 +08:00
Huabing.Xu 27d0f6328f origin code of viewport 2015-06-01 14:26:08 +08:00
Vladimir Perminov ba06886e01 GLViewImpl initWithRect bug size
glfwCreateWindow not guarantees create windows need size, watch real
create size and change setFrameSize( see declaration glfwCreateWindow)

Example Windows 7, if request height size > Desktop height make window
size: Desktop height - height Caption.
2015-04-06 14:24:22 +03:00
Chad 395c14f07d Hide Cursor - Feature Request
Added the ability to hide or show the cursor on desktop builds.
2015-03-02 23:21:18 -08:00
Dhilan007 8b78c181ce Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT. 2014-12-10 18:11:07 +08:00
James Chen cebfed108c issue : Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHT_ALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode. 2014-11-26 10:41:14 +08:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00